Revert 105661 - Revert 105659 - Delay network requests on startup if any webRequest or webNavigat...

chrome/browser/extensions/extension_host.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_host.h"
 
 #include <list>
 
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
@@ skipping 139 matching lines @@
   // Listen for when the render process' handle is available so we can add it
   // to the task manager then.
   registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CREATED,
                  Source<RenderProcessHost>(render_process_host()));
   // Listen for when an extension is unloaded from the same profile, as it may
   // be the same extension that this points to.
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  Source<Profile>(profile_));
 }
 
+// This "mock" constructor should only be used by unit tests.
+ExtensionHost::ExtensionHost(const Extension* extension,
+                             content::ViewType host_type)
+    : extension_(extension),
+      extension_id_(extension->id()),
+      profile_(NULL),
+      render_view_host_(NULL),
+      did_stop_loading_(false),
+      document_element_available_(false),
+      url_(GURL()),
+      ALLOW_THIS_IN_INITIALIZER_LIST(
+          extension_function_dispatcher_(profile_, this)),
+      extension_host_type_(host_type),
+      associated_tab_contents_(NULL) {
+}
+
 ExtensionHost::~ExtensionHost() {
   NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED,
       Source<Profile>(profile_),
       Details<ExtensionHost>(this));
   ProcessCreationQueue::GetInstance()->Remove(this);
   GetJavaScriptDialogCreatorInstance()->ResetJavaScriptState(this);
-  render_view_host_->Shutdown();  // deletes render_view_host
+  // render_view_host_ may be NULL in unit tests.
+  if (render_view_host_)
+    render_view_host_->Shutdown();  // deletes render_view_host
 }
 
 void ExtensionHost::CreateView(Browser* browser) {
 #if defined(TOOLKIT_VIEWS)
   view_.reset(new ExtensionView(this, browser));
   // We own |view_|, so don't auto delete when it's removed from the view
   // hierarchy.
   view_->set_parent_owned(false);
 #elif defined(OS_MACOSX)
   view_.reset(new ExtensionViewMac(this, browser));
@@ skipping 616 matching lines @@
 void ExtensionHost::RenderViewCreated(RenderViewHost* render_view_host) {
   if (view_.get())
     view_->RenderViewCreated();
 
   if (extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_POPUP ||
       extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_INFOBAR) {
         render_view_host->EnablePreferredSizeMode(
             kPreferredSizeWidth | kPreferredSizeHeightThisIsSlow);
   }
 }