Use Dispatcher::OnRenderThreadStarted to register extensions::SafeBuiltins

Change-Id: I82bca85f027b47e538fb4ceb1893cbdcf23352d6
Reviewed-on: https://chromium-review.googlesource.com/c/1279957
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599655}

chrome/renderer/extensions/chrome_extensions_renderer_client.cc

@@ -158,7 +158,7 @@ void ChromeExtensionsRendererClient::RenderThreadStarted() {
     extension_dispatcher_ = std::make_unique<extensions::Dispatcher>(
         std::make_unique<ChromeExtensionsDispatcherDelegate>());
   }
-  thread->RegisterExtension(extensions::SafeBuiltins::CreateV8Extension());
+  extension_dispatcher_->OnRenderThreadStarted(thread);
   permissions_policy_delegate_.reset(
       new extensions::RendererPermissionsPolicyDelegate(
           extension_dispatcher_.get()));

extensions/renderer/dispatcher.cc

@@ -81,6 +81,7 @@
 #include "extensions/renderer/renderer_messaging_service.h"
 #include "extensions/renderer/request_sender.h"
 #include "extensions/renderer/runtime_custom_bindings.h"
+#include "extensions/renderer/safe_builtins.h"
 #include "extensions/renderer/script_context.h"
 #include "extensions/renderer/script_context_set.h"
 #include "extensions/renderer/script_injection.h"
@@ -245,6 +246,10 @@ Dispatcher::Dispatcher(std::unique_ptr<DispatcherDelegate> delegate)
 Dispatcher::~Dispatcher() {
 }
 
+void Dispatcher::OnRenderThreadStarted(content::RenderThread* thread) {
+  thread->RegisterExtension(extensions::SafeBuiltins::CreateV8Extension());
+}
+
 void Dispatcher::OnRenderFrameCreated(content::RenderFrame* render_frame) {
   script_injection_manager_->OnRenderFrameCreated(render_frame);
   content_watcher_->OnRenderFrameCreated(render_frame);

extensions/renderer/dispatcher.h

@@ -51,6 +51,10 @@ namespace base {
 class ListValue;
 }
 
+namespace content {
+class RenderThread;
+}  // namespace content
+
 namespace extensions {
 class ContentWatcher;
 class DispatcherDelegate;
@@ -80,6 +84,8 @@ class Dispatcher : public content::RenderThreadObserver,
 
   bool activity_logging_enabled() const { return activity_logging_enabled_; }
 
+  void OnRenderThreadStarted(content::RenderThread* render_thread);
+
   void OnRenderFrameCreated(content::RenderFrame* render_frame);
 
   bool IsExtensionActive(const std::string& extension_id) const;

extensions/shell/renderer/shell_extensions_renderer_client.cc

@@ -7,15 +7,13 @@
 #include "content/public/renderer/render_thread.h"
 #include "extensions/renderer/dispatcher.h"
 #include "extensions/renderer/dispatcher_delegate.h"
-#include "extensions/renderer/safe_builtins.h"
 
 namespace extensions {
 
 ShellExtensionsRendererClient::ShellExtensionsRendererClient()
     : dispatcher_(std::make_unique<Dispatcher>(
           std::make_unique<DispatcherDelegate>())) {
-  content::RenderThread::Get()->RegisterExtension(
-      extensions::SafeBuiltins::CreateV8Extension());
+  dispatcher_->OnRenderThreadStarted(content::RenderThread::Get());
 }
 
 ShellExtensionsRendererClient::~ShellExtensionsRendererClient() {