Update to Chromium revision adb61db1 (#508578)

libcef/renderer/content_renderer_client.cc

@@ -330,11 +330,6 @@ void CefContentRendererClient::WebKitInitialized() {
   }
 }
 
-void CefContentRendererClient::OnRenderProcessShutdown() {
-  // Destroy global objects associated with the default Isolate.
-  CefV8IsolateDestroyed();
-}
-
 void CefContentRendererClient::DevToolsAgentAttached() {
   CEF_REQUIRE_RT();
   ++devtools_agent_count_;

libcef/renderer/content_renderer_client.h

@@ -75,7 +75,6 @@ class CefContentRendererClient : public content::ContentRendererClient,
   }
 
   void WebKitInitialized();
-  void OnRenderProcessShutdown();
 
   void DevToolsAgentAttached();
   void DevToolsAgentDetached();

libcef/renderer/extensions/extensions_renderer_client.cc

@@ -18,9 +18,9 @@
 #include "content/public/renderer/render_thread.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/switches.h"
+#include "extensions/renderer/api/automation/automation_api_helper.h"
 #include "extensions/renderer/dispatcher.h"
 #include "extensions/renderer/extension_frame_helper.h"
-#include "extensions/renderer/extension_helper.h"
 #include "extensions/renderer/extensions_render_frame_observer.h"
 #include "extensions/renderer/guest_view/extensions_guest_view_container.h"
 #include "extensions/renderer/guest_view/extensions_guest_view_container_dispatcher.h"
@@ -130,10 +130,8 @@ void CefExtensionsRendererClient::OnExtensionUnloaded(
 void CefExtensionsRendererClient::RenderThreadStarted() {
   content::RenderThread* thread = content::RenderThread::Get();
 
-  extension_dispatcher_delegate_.reset(
-      new extensions::CefExtensionsDispatcherDelegate());
-  extension_dispatcher_.reset(
-      new extensions::Dispatcher(extension_dispatcher_delegate_.get()));
+  extension_dispatcher_.reset(new extensions::Dispatcher(
+      std::make_unique<extensions::CefExtensionsDispatcherDelegate>()));
   resource_request_policy_.reset(
       new extensions::ResourceRequestPolicy(extension_dispatcher_.get()));
   guest_view_container_dispatcher_.reset(
@@ -154,7 +152,8 @@ void CefExtensionsRendererClient::RenderFrameCreated(
 
 void CefExtensionsRendererClient::RenderViewCreated(
     content::RenderView* render_view) {
-  new extensions::ExtensionHelper(render_view, extension_dispatcher_.get());
+  // Manages its own lifetime.
+  new extensions::AutomationApiHelper(render_view);
 }
 
 bool CefExtensionsRendererClient::OverrideCreatePlugin(

libcef/renderer/extensions/extensions_renderer_client.h

@@ -75,8 +75,6 @@ class CefExtensionsRendererClient : public ExtensionsRendererClient {
       const GURL& original_url);
 
  private:
-  std::unique_ptr<extensions::DispatcherDelegate>
-      extension_dispatcher_delegate_;
   std::unique_ptr<extensions::Dispatcher> extension_dispatcher_;
   std::unique_ptr<extensions::ExtensionsGuestViewContainerDispatcher>
       guest_view_container_dispatcher_;

libcef/renderer/plugins/cef_plugin_placeholder.cc

@@ -69,7 +69,7 @@ CefPluginPlaceholder* CefPluginPlaceholder::CreateLoadableMissingPlugin(
     content::RenderFrame* render_frame,
     const blink::WebPluginParams& params) {
   const base::StringPiece template_html(
-      ResourceBundle::GetSharedInstance().GetRawDataResource(
+      ui::ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_BLOCKED_PLUGIN_HTML));
 
   base::DictionaryValue values;
@@ -121,7 +121,7 @@ CefPluginPlaceholder* CefPluginPlaceholder::CreateBlockedPlugin(
   }
 
   const base::StringPiece template_html(
-      ResourceBundle::GetSharedInstance().GetRawDataResource(template_id));
+      ui::ResourceBundle::GetSharedInstance().GetRawDataResource(template_id));
 
   DCHECK(!template_html.empty())
       << "unable to load template. ID: " << template_id;

libcef/renderer/render_thread_observer.cc

@@ -54,11 +54,6 @@ bool CefRenderThreadObserver::OnControlMessageReceived(
   return handled;
 }
 
-void CefRenderThreadObserver::OnRenderProcessShutdown() {
-  CefContentRendererClient::Get()->OnRenderProcessShutdown();
-  visited_link_slave_.reset();
-}
-
 void CefRenderThreadObserver::OnSetIsIncognitoProcess(
     bool is_incognito_process) {
   is_incognito_process_ = is_incognito_process;

libcef/renderer/render_thread_observer.h

@@ -27,7 +27,6 @@ class CefRenderThreadObserver : public content::RenderThreadObserver {
 
   // RenderThreadObserver implementation.
   bool OnControlMessageReceived(const IPC::Message& message) override;
-  void OnRenderProcessShutdown() override;
 
   visitedlink::VisitedLinkSlave* visited_link_slave() {
     return visited_link_slave_.get();

libcef/renderer/webkit_glue.cc

@@ -163,7 +163,7 @@ v8::MaybeLocal<v8::Value> ExecuteV8ScriptAndReturnValue(
                            : blink::KURL(blink::kParsedURLString, source_url);
 
   const blink::ScriptSourceCode ssc = blink::ScriptSourceCode(
-      source, kurl,
+      source, kurl, blink::WebString() /* nonce */, blink::kNotParserInserted,
       WTF::TextPosition(WTF::OrdinalNumber::FromOneBasedInt(start_line),
                         WTF::OrdinalNumber::FromZeroBasedInt(0)));