Commit 8bc55d75 authored by Gustavo Noronha's avatar Gustavo Noronha
Browse files

kov build fixes

parent 5a5b538a
...@@ -160,11 +160,6 @@ patches = [ ...@@ -160,11 +160,6 @@ patches = [
# https://bitbucket.org/chromiumembedded/cef/issues/1710 # https://bitbucket.org/chromiumembedded/cef/issues/1710
'name': 'supports_user_data_1710', 'name': 'supports_user_data_1710',
}, },
{
# Fix background color on Mac.
# https://codereview.chromium.org/1070383005 (reverted)
'name': 'render_widget_host_1070383005',
},
{ {
# Fix missing check for defined(ENABLE_THEMES) in # Fix missing check for defined(ENABLE_THEMES) in
# renderer_preferences_util.cc on Linux. # renderer_preferences_util.cc on Linux.
...@@ -306,11 +301,6 @@ patches = [ ...@@ -306,11 +301,6 @@ patches = [
# https://bitbucket.org/chromiumembedded/cef/issues/2102 # https://bitbucket.org/chromiumembedded/cef/issues/2102
'name': 'views_menu_2102', 'name': 'views_menu_2102',
}, },
{
# Mac: Fix build error when including openssl/opensslconf.h.
# https://bugs.chromium.org/p/chromium/issues/detail?id=711670
'name': 'mac_build_711670',
},
{ {
# Linux: Remove DCHECK during GPU feature info detection. # Linux: Remove DCHECK during GPU feature info detection.
# https://bugs.chromium.org/p/chromium/issues/detail?id=699278 # https://bugs.chromium.org/p/chromium/issues/detail?id=699278
......
diff --git chrome/browser/download/download_target_determiner.cc chrome/browser/download/download_target_determiner.cc diff --git chrome/browser/download/download_target_determiner.cc chrome/browser/download/download_target_determiner.cc
index 47820a5..520ca4cd 100644 index 502b3d3..c37efa9 100644
--- chrome/browser/download/download_target_determiner.cc --- chrome/browser/download/download_target_determiner.cc
+++ chrome/browser/download/download_target_determiner.cc +++ chrome/browser/download/download_target_determiner.cc
@@ -475,8 +475,8 @@ void IsHandledBySafePlugin(content::ResourceContext* resource_context, @@ -476,8 +476,8 @@ void IsHandledBySafePlugin(content::ResourceContext* resource_context,
content::PluginService* plugin_service = content::PluginService* plugin_service =
content::PluginService::GetInstance(); content::PluginService::GetInstance();
bool plugin_found = plugin_service->GetPluginInfo( bool plugin_found = plugin_service->GetPluginInfo(
...@@ -38,7 +38,7 @@ index f8b651f..ec39f8d 100644 ...@@ -38,7 +38,7 @@ index f8b651f..ec39f8d 100644
content::WebPluginInfo* plugin) override; content::WebPluginInfo* plugin) override;
diff --git chrome/browser/plugins/plugin_info_message_filter.cc chrome/browser/plugins/plugin_info_message_filter.cc diff --git chrome/browser/plugins/plugin_info_message_filter.cc chrome/browser/plugins/plugin_info_message_filter.cc
index 09b5753..11a5f32 100644 index 29d2d13..5c72963 100644
--- chrome/browser/plugins/plugin_info_message_filter.cc --- chrome/browser/plugins/plugin_info_message_filter.cc
+++ chrome/browser/plugins/plugin_info_message_filter.cc +++ chrome/browser/plugins/plugin_info_message_filter.cc
@@ -451,8 +451,8 @@ bool PluginInfoMessageFilter::Context::FindEnabledPlugin( @@ -451,8 +451,8 @@ bool PluginInfoMessageFilter::Context::FindEnabledPlugin(
...@@ -66,10 +66,10 @@ index 0ce31db0..58c4633 100644 ...@@ -66,10 +66,10 @@ index 0ce31db0..58c4633 100644
} }
diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index c147373..2e7cb5f 100644 index efc5b8b..0f39dc8 100644
--- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc --- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -591,6 +591,6 @@ void BrowserTabStripController::OnFindURLMimeTypeCompleted( @@ -586,6 +586,6 @@ void BrowserTabStripController::OnFindURLMimeTypeCompleted(
content::PluginService::GetInstance()->GetPluginInfo( content::PluginService::GetInstance()->GetPluginInfo(
-1, // process ID -1, // process ID
MSG_ROUTING_NONE, // routing ID MSG_ROUTING_NONE, // routing ID
...@@ -78,10 +78,10 @@ index c147373..2e7cb5f 100644 ...@@ -78,10 +78,10 @@ index c147373..2e7cb5f 100644
mime_type, false, NULL, &plugin, NULL)); mime_type, false, NULL, &plugin, NULL));
} }
diff --git content/browser/frame_host/navigation_handle_impl.cc content/browser/frame_host/navigation_handle_impl.cc diff --git content/browser/frame_host/navigation_handle_impl.cc content/browser/frame_host/navigation_handle_impl.cc
index 8dca644..d60c069 100644 index b86f81e..c4d39fb 100644
--- content/browser/frame_host/navigation_handle_impl.cc --- content/browser/frame_host/navigation_handle_impl.cc
+++ content/browser/frame_host/navigation_handle_impl.cc +++ content/browser/frame_host/navigation_handle_impl.cc
@@ -265,12 +265,6 @@ net::Error NavigationHandleImpl::GetNetErrorCode() { @@ -266,12 +266,6 @@ net::Error NavigationHandleImpl::GetNetErrorCode() {
} }
RenderFrameHostImpl* NavigationHandleImpl::GetRenderFrameHost() { RenderFrameHostImpl* NavigationHandleImpl::GetRenderFrameHost() {
...@@ -95,7 +95,7 @@ index 8dca644..d60c069 100644 ...@@ -95,7 +95,7 @@ index 8dca644..d60c069 100644
} }
diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc
index ccd8ee7..cc52a93 100644 index 88f071a..58533a7 100644
--- content/browser/frame_host/render_frame_host_impl.cc --- content/browser/frame_host/render_frame_host_impl.cc
+++ content/browser/frame_host/render_frame_host_impl.cc +++ content/browser/frame_host/render_frame_host_impl.cc
@@ -814,10 +814,8 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) { @@ -814,10 +814,8 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) {
...@@ -109,7 +109,7 @@ index ccd8ee7..cc52a93 100644 ...@@ -109,7 +109,7 @@ index ccd8ee7..cc52a93 100644
IPC_MESSAGE_HANDLER(FrameHostMsg_ShowCreatedWindow, OnShowCreatedWindow) IPC_MESSAGE_HANDLER(FrameHostMsg_ShowCreatedWindow, OnShowCreatedWindow)
IPC_END_MESSAGE_MAP() IPC_END_MESSAGE_MAP()
@@ -1229,6 +1227,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( @@ -1242,6 +1240,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
if (navigation_handle_) { if (navigation_handle_) {
navigation_handle_->set_net_error_code( navigation_handle_->set_net_error_code(
static_cast<net::Error>(params.error_code)); static_cast<net::Error>(params.error_code));
...@@ -117,7 +117,7 @@ index ccd8ee7..cc52a93 100644 ...@@ -117,7 +117,7 @@ index ccd8ee7..cc52a93 100644
} }
frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params);
@@ -2425,14 +2424,12 @@ void RenderFrameHostImpl::OnHidePopup() { @@ -2441,14 +2440,12 @@ void RenderFrameHostImpl::OnHidePopup() {
} }
#endif #endif
...@@ -133,10 +133,10 @@ index ccd8ee7..cc52a93 100644 ...@@ -133,10 +133,10 @@ index ccd8ee7..cc52a93 100644
void RenderFrameHostImpl::OnShowCreatedWindow(int pending_widget_routing_id, void RenderFrameHostImpl::OnShowCreatedWindow(int pending_widget_routing_id,
WindowOpenDisposition disposition, WindowOpenDisposition disposition,
diff --git content/browser/frame_host/render_frame_host_impl.h content/browser/frame_host/render_frame_host_impl.h diff --git content/browser/frame_host/render_frame_host_impl.h content/browser/frame_host/render_frame_host_impl.h
index 7d13f01..9b2d494 100644 index c155890..1216213 100644
--- content/browser/frame_host/render_frame_host_impl.h --- content/browser/frame_host/render_frame_host_impl.h
+++ content/browser/frame_host/render_frame_host_impl.h +++ content/browser/frame_host/render_frame_host_impl.h
@@ -783,8 +783,8 @@ class CONTENT_EXPORT RenderFrameHostImpl @@ -787,8 +787,8 @@ class CONTENT_EXPORT RenderFrameHostImpl
void OnShowPopup(const FrameHostMsg_ShowPopup_Params& params); void OnShowPopup(const FrameHostMsg_ShowPopup_Params& params);
void OnHidePopup(); void OnHidePopup();
#endif #endif
...@@ -147,10 +147,10 @@ index 7d13f01..9b2d494 100644 ...@@ -147,10 +147,10 @@ index 7d13f01..9b2d494 100644
mojo::ScopedMessagePipeHandle pipe); mojo::ScopedMessagePipeHandle pipe);
#endif #endif
diff --git content/browser/frame_host/render_frame_message_filter.cc content/browser/frame_host/render_frame_message_filter.cc diff --git content/browser/frame_host/render_frame_message_filter.cc content/browser/frame_host/render_frame_message_filter.cc
index 5b8f571..958ebfb1 100644 index 35f7afc..280e3ae 100644
--- content/browser/frame_host/render_frame_message_filter.cc --- content/browser/frame_host/render_frame_message_filter.cc
+++ content/browser/frame_host/render_frame_message_filter.cc +++ content/browser/frame_host/render_frame_message_filter.cc
@@ -446,6 +446,7 @@ void RenderFrameMessageFilter::GetCookies(int render_frame_id, @@ -448,6 +448,7 @@ void RenderFrameMessageFilter::GetCookies(int render_frame_id,
void RenderFrameMessageFilter::OnGetPlugins( void RenderFrameMessageFilter::OnGetPlugins(
bool refresh, bool refresh,
...@@ -158,7 +158,7 @@ index 5b8f571..958ebfb1 100644 ...@@ -158,7 +158,7 @@ index 5b8f571..958ebfb1 100644
const url::Origin& main_frame_origin, const url::Origin& main_frame_origin,
IPC::Message* reply_msg) { IPC::Message* reply_msg) {
// Don't refresh if the specified threshold has not been passed. Note that // Don't refresh if the specified threshold has not been passed. Note that
@@ -467,18 +468,19 @@ void RenderFrameMessageFilter::OnGetPlugins( @@ -469,18 +470,19 @@ void RenderFrameMessageFilter::OnGetPlugins(
PluginServiceImpl::GetInstance()->GetPlugins( PluginServiceImpl::GetInstance()->GetPlugins(
base::Bind(&RenderFrameMessageFilter::GetPluginsCallback, this, reply_msg, base::Bind(&RenderFrameMessageFilter::GetPluginsCallback, this, reply_msg,
...@@ -180,7 +180,7 @@ index 5b8f571..958ebfb1 100644 ...@@ -180,7 +180,7 @@ index 5b8f571..958ebfb1 100644
int routing_id = MSG_ROUTING_NONE; int routing_id = MSG_ROUTING_NONE;
// In this loop, copy the WebPluginInfo (and do not use a reference) because // In this loop, copy the WebPluginInfo (and do not use a reference) because
// the filter might mutate it. // the filter might mutate it.
@@ -487,7 +489,7 @@ void RenderFrameMessageFilter::GetPluginsCallback( @@ -489,7 +491,7 @@ void RenderFrameMessageFilter::GetPluginsCallback(
if (!filter || if (!filter ||
filter->IsPluginAvailable(child_process_id, routing_id, filter->IsPluginAvailable(child_process_id, routing_id,
resource_context_, main_frame_origin.GetURL(), resource_context_, main_frame_origin.GetURL(),
...@@ -189,7 +189,7 @@ index 5b8f571..958ebfb1 100644 ...@@ -189,7 +189,7 @@ index 5b8f571..958ebfb1 100644
plugins.push_back(plugin); plugins.push_back(plugin);
} }
} }
@@ -499,6 +501,7 @@ void RenderFrameMessageFilter::GetPluginsCallback( @@ -501,6 +503,7 @@ void RenderFrameMessageFilter::GetPluginsCallback(
void RenderFrameMessageFilter::OnGetPluginInfo( void RenderFrameMessageFilter::OnGetPluginInfo(
int render_frame_id, int render_frame_id,
const GURL& url, const GURL& url,
...@@ -197,7 +197,7 @@ index 5b8f571..958ebfb1 100644 ...@@ -197,7 +197,7 @@ index 5b8f571..958ebfb1 100644
const url::Origin& main_frame_origin, const url::Origin& main_frame_origin,
const std::string& mime_type, const std::string& mime_type,
bool* found, bool* found,
@@ -507,8 +510,8 @@ void RenderFrameMessageFilter::OnGetPluginInfo( @@ -509,8 +512,8 @@ void RenderFrameMessageFilter::OnGetPluginInfo(
bool allow_wildcard = true; bool allow_wildcard = true;
*found = plugin_service_->GetPluginInfo( *found = plugin_service_->GetPluginInfo(
render_process_id_, render_frame_id, resource_context_, url, render_process_id_, render_frame_id, resource_context_, url,
...@@ -279,10 +279,10 @@ index 9e7a5ef..ee721d0 100644 ...@@ -279,10 +279,10 @@ index 9e7a5ef..ee721d0 100644
const std::string& mime_type, const std::string& mime_type,
bool allow_wildcard, bool allow_wildcard,
diff --git content/common/frame_messages.h content/common/frame_messages.h diff --git content/common/frame_messages.h content/common/frame_messages.h
index b8be34e..db85a84 100644 index aebe975..19be16a 100644
--- content/common/frame_messages.h --- content/common/frame_messages.h
+++ content/common/frame_messages.h +++ content/common/frame_messages.h
@@ -1277,8 +1277,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback, @@ -1284,8 +1284,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
// Used to get the list of plugins. |main_frame_origin| is used to handle // Used to get the list of plugins. |main_frame_origin| is used to handle
// exceptions for plugin content settings. // exceptions for plugin content settings.
...@@ -293,7 +293,7 @@ index b8be34e..db85a84 100644 ...@@ -293,7 +293,7 @@ index b8be34e..db85a84 100644
url::Origin /* main_frame_origin */, url::Origin /* main_frame_origin */,
std::vector<content::WebPluginInfo> /* plugins */) std::vector<content::WebPluginInfo> /* plugins */)
@@ -1286,9 +1287,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins, @@ -1293,9 +1294,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins,
// type. If there is no matching plugin, |found| is false. // type. If there is no matching plugin, |found| is false.
// |actual_mime_type| is the actual mime type supported by the // |actual_mime_type| is the actual mime type supported by the
// found plugin. // found plugin.
...@@ -305,7 +305,7 @@ index b8be34e..db85a84 100644 ...@@ -305,7 +305,7 @@ index b8be34e..db85a84 100644
url::Origin /* main_frame_origin */, url::Origin /* main_frame_origin */,
std::string /* mime_type */, std::string /* mime_type */,
bool /* found */, bool /* found */,
@@ -1648,9 +1650,9 @@ IPC_MESSAGE_ROUTED3(FrameHostMsg_FindMatchRects_Reply, @@ -1655,9 +1657,9 @@ IPC_MESSAGE_ROUTED3(FrameHostMsg_FindMatchRects_Reply,
IPC_MESSAGE_ROUTED2(FrameHostMsg_GetNearestFindResult_Reply, IPC_MESSAGE_ROUTED2(FrameHostMsg_GetNearestFindResult_Reply,
int /* nfr_request_id */, int /* nfr_request_id */,
float /* distance */) float /* distance */)
...@@ -317,10 +317,10 @@ index b8be34e..db85a84 100644 ...@@ -317,10 +317,10 @@ index b8be34e..db85a84 100644
// Adding a new message? Stick to the sort order above: first platform // Adding a new message? Stick to the sort order above: first platform
// independent FrameMsg, then ifdefs for platform specific FrameMsg, then // independent FrameMsg, then ifdefs for platform specific FrameMsg, then
diff --git content/ppapi_plugin/ppapi_blink_platform_impl.cc content/ppapi_plugin/ppapi_blink_platform_impl.cc diff --git content/ppapi_plugin/ppapi_blink_platform_impl.cc content/ppapi_plugin/ppapi_blink_platform_impl.cc
index 6c24359..279edb2 100644 index b13765a..d6ce568 100644
--- content/ppapi_plugin/ppapi_blink_platform_impl.cc --- content/ppapi_plugin/ppapi_blink_platform_impl.cc
+++ content/ppapi_plugin/ppapi_blink_platform_impl.cc +++ content/ppapi_plugin/ppapi_blink_platform_impl.cc
@@ -211,6 +211,7 @@ blink::WebURLLoader* PpapiBlinkPlatformImpl::CreateURLLoader() { @@ -212,6 +212,7 @@ std::unique_ptr<blink::WebURLLoader> PpapiBlinkPlatformImpl::CreateURLLoader() {
void PpapiBlinkPlatformImpl::GetPluginList( void PpapiBlinkPlatformImpl::GetPluginList(
bool refresh, bool refresh,
...@@ -329,12 +329,12 @@ index 6c24359..279edb2 100644 ...@@ -329,12 +329,12 @@ index 6c24359..279edb2 100644
blink::WebPluginListBuilder* builder) { blink::WebPluginListBuilder* builder) {
NOTREACHED(); NOTREACHED();
diff --git content/ppapi_plugin/ppapi_blink_platform_impl.h content/ppapi_plugin/ppapi_blink_platform_impl.h diff --git content/ppapi_plugin/ppapi_blink_platform_impl.h content/ppapi_plugin/ppapi_blink_platform_impl.h
index afcf809..1c9af66 100644 index 097b5eb..34e5937 100644
--- content/ppapi_plugin/ppapi_blink_platform_impl.h --- content/ppapi_plugin/ppapi_blink_platform_impl.h
+++ content/ppapi_plugin/ppapi_blink_platform_impl.h +++ content/ppapi_plugin/ppapi_blink_platform_impl.h
@@ -45,6 +45,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImpl { @@ -45,6 +45,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImpl {
blink::WebThemeEngine* ThemeEngine() override; blink::WebThemeEngine* ThemeEngine() override;
blink::WebURLLoader* CreateURLLoader() override; std::unique_ptr<blink::WebURLLoader> CreateURLLoader() override;
void GetPluginList(bool refresh, void GetPluginList(bool refresh,
+ bool isMainFrame, + bool isMainFrame,
const blink::WebSecurityOrigin& mainFrameOrigin, const blink::WebSecurityOrigin& mainFrameOrigin,
...@@ -365,10 +365,10 @@ index 3b610b1..7c439e0 100644 ...@@ -365,10 +365,10 @@ index 3b610b1..7c439e0 100644
WebPluginInfo* plugin) = 0; WebPluginInfo* plugin) = 0;
diff --git content/public/renderer/content_renderer_client.cc content/public/renderer/content_renderer_client.cc diff --git content/public/renderer/content_renderer_client.cc content/public/renderer/content_renderer_client.cc
index d29d85f..6c32ef2 100644 index 5d42160..8e2027e 100644
--- content/public/renderer/content_renderer_client.cc --- content/public/renderer/content_renderer_client.cc
+++ content/public/renderer/content_renderer_client.cc +++ content/public/renderer/content_renderer_client.cc
@@ -97,7 +97,6 @@ bool ContentRendererClient::AllowPopup() { @@ -98,7 +98,6 @@ bool ContentRendererClient::AllowPopup() {
return false; return false;
} }
...@@ -376,7 +376,7 @@ index d29d85f..6c32ef2 100644 ...@@ -376,7 +376,7 @@ index d29d85f..6c32ef2 100644
bool ContentRendererClient::HandleNavigation( bool ContentRendererClient::HandleNavigation(
RenderFrame* render_frame, RenderFrame* render_frame,
bool is_content_initiated, bool is_content_initiated,
@@ -110,6 +109,7 @@ bool ContentRendererClient::HandleNavigation( @@ -111,6 +110,7 @@ bool ContentRendererClient::HandleNavigation(
return false; return false;
} }
...@@ -385,10 +385,10 @@ index d29d85f..6c32ef2 100644 ...@@ -385,10 +385,10 @@ index d29d85f..6c32ef2 100644
return false; return false;
} }
diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
index d544fb7..260079c 100644 index 097e8c0..2e85b99 100644
--- content/public/renderer/content_renderer_client.h --- content/public/renderer/content_renderer_client.h
+++ content/public/renderer/content_renderer_client.h +++ content/public/renderer/content_renderer_client.h
@@ -197,7 +197,6 @@ class CONTENT_EXPORT ContentRendererClient { @@ -195,7 +195,6 @@ class CONTENT_EXPORT ContentRendererClient {
// Returns true if a popup window should be allowed. // Returns true if a popup window should be allowed.
virtual bool AllowPopup(); virtual bool AllowPopup();
...@@ -396,7 +396,7 @@ index d544fb7..260079c 100644 ...@@ -396,7 +396,7 @@ index d544fb7..260079c 100644
// TODO(sgurun) This callback is deprecated and will be removed as soon // TODO(sgurun) This callback is deprecated and will be removed as soon
// as android webview completes implementation of a resource throttle based // as android webview completes implementation of a resource throttle based
// shouldoverrideurl implementation. See crbug.com/325351 // shouldoverrideurl implementation. See crbug.com/325351
@@ -213,6 +212,7 @@ class CONTENT_EXPORT ContentRendererClient { @@ -211,6 +210,7 @@ class CONTENT_EXPORT ContentRendererClient {
blink::WebNavigationPolicy default_policy, blink::WebNavigationPolicy default_policy,
bool is_redirect); bool is_redirect);
...@@ -405,10 +405,10 @@ index d544fb7..260079c 100644 ...@@ -405,10 +405,10 @@ index d544fb7..260079c 100644
// built in media player for the given |url|. Defaults to false. // built in media player for the given |url|. Defaults to false.
virtual bool ShouldUseMediaPlayerForURL(const GURL& url); virtual bool ShouldUseMediaPlayerForURL(const GURL& url);
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index 6922b94..473d148 100644 index f68037c..2b6155e 100644
--- content/renderer/render_frame_impl.cc --- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc
@@ -2795,7 +2795,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( @@ -2798,7 +2798,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
std::string mime_type; std::string mime_type;
bool found = false; bool found = false;
Send(new FrameHostMsg_GetPluginInfo( Send(new FrameHostMsg_GetPluginInfo(
...@@ -418,7 +418,7 @@ index 6922b94..473d148 100644 ...@@ -418,7 +418,7 @@ index 6922b94..473d148 100644
params.mime_type.Utf8(), &found, &info, &mime_type)); params.mime_type.Utf8(), &found, &info, &mime_type));
if (!found) if (!found)
return NULL; return NULL;
@@ -5364,9 +5365,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( @@ -5354,9 +5355,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
(!IsBrowserSideNavigationEnabled() || (!IsBrowserSideNavigationEnabled() ||
url != pending_navigation_params_->request_params.redirects[0])); url != pending_navigation_params_->request_params.redirects[0]));
...@@ -430,7 +430,7 @@ index 6922b94..473d148 100644 ...@@ -430,7 +430,7 @@ index 6922b94..473d148 100644
// The handlenavigation API is deprecated and will be removed once // The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved. // crbug.com/325351 is resolved.
if (GetContentClient()->renderer()->HandleNavigation( if (GetContentClient()->renderer()->HandleNavigation(
@@ -5379,7 +5379,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( @@ -5369,7 +5369,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
} }
return blink::kWebNavigationPolicyIgnore; return blink::kWebNavigationPolicyIgnore;
} }
...@@ -439,10 +439,10 @@ index 6922b94..473d148 100644 ...@@ -439,10 +439,10 @@ index 6922b94..473d148 100644
Referrer referrer( Referrer referrer(
RenderViewImpl::GetReferrerFromRequest(frame_, info.url_request)); RenderViewImpl::GetReferrerFromRequest(frame_, info.url_request));
diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
index 4ba0c48..46f2afde 100644 index 4f920ce..4cd548c 100644
--- content/renderer/renderer_blink_platform_impl.cc --- content/renderer/renderer_blink_platform_impl.cc
+++ content/renderer/renderer_blink_platform_impl.cc +++ content/renderer/renderer_blink_platform_impl.cc
@@ -737,6 +737,7 @@ blink::WebMIDIAccessor* RendererBlinkPlatformImpl::CreateMIDIAccessor( @@ -736,6 +736,7 @@ blink::WebMIDIAccessor* RendererBlinkPlatformImpl::CreateMIDIAccessor(
void RendererBlinkPlatformImpl::GetPluginList( void RendererBlinkPlatformImpl::GetPluginList(
bool refresh, bool refresh,
...@@ -450,7 +450,7 @@ index 4ba0c48..46f2afde 100644 ...@@ -450,7 +450,7 @@ index 4ba0c48..46f2afde 100644
const blink::WebSecurityOrigin& mainFrameOrigin, const blink::WebSecurityOrigin& mainFrameOrigin,
blink::WebPluginListBuilder* builder) { blink::WebPluginListBuilder* builder) {
#if BUILDFLAG(ENABLE_PLUGINS) #if BUILDFLAG(ENABLE_PLUGINS)
@@ -744,7 +745,8 @@ void RendererBlinkPlatformImpl::GetPluginList( @@ -743,7 +744,8 @@ void RendererBlinkPlatformImpl::GetPluginList(
if (!plugin_refresh_allowed_) if (!plugin_refresh_allowed_)
refresh = false; refresh = false;
RenderThread::Get()->Send( RenderThread::Get()->Send(
...@@ -461,10 +461,10 @@ index 4ba0c48..46f2afde 100644 ...@@ -461,10 +461,10 @@ index 4ba0c48..46f2afde 100644
builder->AddPlugin(WebString::FromUTF16(plugin.name), builder->AddPlugin(WebString::FromUTF16(plugin.name),
WebString::FromUTF16(plugin.desc), WebString::FromUTF16(plugin.desc),
diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
index 19306df..a731786 100644 index ff5ee76..f570e2a 100644
--- content/renderer/renderer_blink_platform_impl.h --- content/renderer/renderer_blink_platform_impl.h
+++ content/renderer/renderer_blink_platform_impl.h +++ content/renderer/renderer_blink_platform_impl.h
@@ -121,6 +121,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { @@ -122,6 +122,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
cc::FrameSinkId GenerateFrameSinkId() override; cc::FrameSinkId GenerateFrameSinkId() override;
void GetPluginList(bool refresh, void GetPluginList(bool refresh,
......
...@@ -146,28 +146,28 @@ index b64f74f..0c3c22e 100644 ...@@ -146,28 +146,28 @@ index b64f74f..0c3c22e 100644
struct Data; struct Data;
diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.h third_party/crashpad/crashpad/handler/crash_report_upload_thread.h diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.h third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
index 14debac..c25c653 100644 index c769efe..daec6cd 100644
--- third_party/crashpad/crashpad/handler/crash_report_upload_thread.h --- third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
+++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.h +++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
@@ -78,7 +78,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate { @@ -89,7 +89,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate {
//! This method may be called from any thread. //! This method may be called from any thread.
void ReportPending(); void ReportPending(const UUID& report_uuid);
- private: - private:
+ protected: + protected:
//! \brief The result code from UploadReport(). //! \brief The result code from UploadReport().
enum class UploadResult { enum class UploadResult {
//! \brief The crash report was uploaded successfully. //! \brief The crash report was uploaded successfully.
@@ -101,7 +101,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate { @@ -117,7 +117,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate {
//! object was constructed with \a watch_pending_reports, it will also scan
//! \brief Obtains all pending reports from the database, and calls //! the crash report database for other pending reports, and process those as
//! ProcessPendingReport() to process each one. //! well.
- void ProcessPendingReports(); - void ProcessPendingReports();
+ virtual void ProcessPendingReports(); + virtual void ProcessPendingReports();
//! \brief Processes a single pending report from the database. //! \brief Processes a single pending report from the database.
//! //!
@@ -115,7 +115,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate { @@ -131,7 +131,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate {
//! remain in the “pending” state. If the upload fails and no more retries are //! remain in the “pending” state. If the upload fails and no more retries are
//! desired, or report upload is disabled, it will be marked as “completed” in //! desired, or report upload is disabled, it will be marked as “completed” in
//! the database without ever having been uploaded. //! the database without ever having been uploaded.
...@@ -177,7 +177,7 @@ index 14debac..c25c653 100644 ...@@ -177,7 +177,7 @@ index 14debac..c25c653 100644
//! \brief Attempts to upload a crash report. //! \brief Attempts to upload a crash report.
//! //!
diff --git third_party/crashpad/crashpad/handler/handler_main.cc third_party/crashpad/crashpad/handler/handler_main.cc diff --git third_party/crashpad/crashpad/handler/handler_main.cc third_party/crashpad/crashpad/handler/handler_main.cc
index 641bf0f..3a86eb3 100644 index e6d05e2..ef20683 100644
--- third_party/crashpad/crashpad/handler/handler_main.cc --- third_party/crashpad/crashpad/handler/handler_main.cc
+++ third_party/crashpad/crashpad/handler/handler_main.cc +++ third_party/crashpad/crashpad/handler/handler_main.cc
@@ -35,8 +35,10 @@ @@ -35,8 +35,10 @@
...@@ -191,7 +191,7 @@ index 641bf0f..3a86eb3 100644 ...@@ -191,7 +191,7 @@ index 641bf0f..3a86eb3 100644
#include "client/crash_report_database.h" #include "client/crash_report_database.h"
#include "client/crashpad_client.h" #include "client/crashpad_client.h"
#include "client/crashpad_info.h" #include "client/crashpad_info.h"
@@ -75,6 +77,10 @@ @@ -76,6 +78,10 @@
#include "util/win/session_end_watcher.h" #include "util/win/session_end_watcher.h"
#endif // OS_MACOSX #endif // OS_MACOSX
...@@ -202,8 +202,8 @@ index 641bf0f..3a86eb3 100644 ...@@ -202,8 +202,8 @@ index 641bf0f..3a86eb3 100644
namespace crashpad { namespace crashpad {
namespace { namespace {
@@ -144,6 +150,9 @@ struct Options { @@ -147,6 +153,9 @@ struct Options {
bool monitor_self; bool periodic_tasks;
bool rate_limit; bool rate_limit;
bool upload_gzip; bool upload_gzip;
+ int max_uploads; + int max_uploads;
...@@ -212,7 +212,7 @@ index 641bf0f..3a86eb3 100644 ...@@ -212,7 +212,7 @@ index 641bf0f..3a86eb3 100644
}; };
// Splits |key_value| on '=' and inserts the resulting key and value into |map|. // Splits |key_value| on '=' and inserts the resulting key and value into |map|.
@@ -425,6 +434,9 @@ int HandlerMain(int argc, @@ -430,6 +439,9 @@ int HandlerMain(int argc,
kOptionResetOwnCrashExceptionPortToSystemDefault, kOptionResetOwnCrashExceptionPortToSystemDefault,
#endif // OS_MACOSX #endif // OS_MACOSX
kOptionURL, kOptionURL,
...@@ -222,7 +222,7 @@ index 641bf0f..3a86eb3 100644 ...@@ -222,7 +222,7 @@ index 641bf0f..3a86eb3 100644
// Standard options. // Standard options.
kOptionHelp = -2, kOptionHelp = -2,
@@ -470,6 +482,9 @@ int HandlerMain(int argc, @@ -476,6 +488,9 @@ int HandlerMain(int argc,
{"url", required_argument, nullptr, kOptionURL}, {"url", required_argument, nullptr, kOptionURL},
{"help", no_argument, nullptr, kOptionHelp}, {"help", no_argument, nullptr, kOptionHelp},
{"version", no_argument, nullptr, kOptionVersion}, {"version", no_argument, nullptr, kOptionVersion},
...@@ -232,7 +232,7 @@ index 641bf0f..3a86eb3 100644 ...@@ -232,7 +232,7 @@ index 641bf0f..3a86eb3 100644
{nullptr, 0, nullptr, 0}, {nullptr, 0, nullptr, 0},
}; };
@@ -564,6 +579,27 @@ int HandlerMain(int argc, @@ -575,6 +590,27 @@ int HandlerMain(int argc,
options.url = optarg; options.url = optarg;
break; break;
} }
...@@ -260,7 +260,7 @@ index 641bf0f..3a86eb3 100644 ...@@ -260,7 +260,7 @@ index 641bf0f..3a86eb3 100644
case kOptionHelp: { case kOptionHelp: {
Usage(me); Usage(me);
MetricsRecordExit(Metrics::LifetimeMilestone::kExitedEarly); MetricsRecordExit(Metrics::LifetimeMilestone::kExitedEarly);
@@ -721,12 +757,19 @@ int HandlerMain(int argc, @@ -734,17 +770,25 @@ int HandlerMain(int argc,
// TODO(scottmg): options.rate_limit should be removed when we have a // TODO(scottmg): options.rate_limit should be removed when we have a
// configurable database setting to control upload limiting. // configurable database setting to control upload limiting.
// See https://crashpad.chromium.org/bug/23. // See https://crashpad.chromium.org/bug/23.
...@@ -269,15 +269,21 @@ index 641bf0f..3a86eb3 100644 ...@@ -269,15 +269,21 @@ index 641bf0f..3a86eb3 100644
+ database.get(), options.url, options.rate_limit, options.upload_gzip, + database.get(), options.url, options.rate_limit, options.upload_gzip,
+ options.max_uploads); + options.max_uploads);
+#else +#else
CrashReportUploadThread upload_thread( CrashReportUploadThread upload_thread(database.get(),
database.get(), options.url, options.rate_limit, options.upload_gzip); options.url,
options.periodic_tasks,
options.rate_limit,
options.upload_gzip);
+#endif +#endif
upload_thread.Start(); upload_thread.Start();