Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3868)

Unified Diff: chrome/browser/extensions/extension_host.cc

Issue 8296017: Revert 105659 - Delay network requests on startup if any webRequest or webNavigation extensions a... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_host.h ('k') | chrome/browser/extensions/extension_prefs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_host.cc
===================================================================
--- chrome/browser/extensions/extension_host.cc (revision 105660)
+++ chrome/browser/extensions/extension_host.cc (working copy)
@@ -157,22 +157,6 @@
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,
@@ -180,9 +164,7 @@
Details<ExtensionHost>(this));
ProcessCreationQueue::GetInstance()->Remove(this);
GetJavaScriptDialogCreatorInstance()->ResetJavaScriptState(this);
- // render_view_host_ may be NULL in unit tests.
- if (render_view_host_)
- render_view_host_->Shutdown(); // deletes render_view_host
+ render_view_host_->Shutdown(); // deletes render_view_host
}
void ExtensionHost::CreateView(Browser* browser) {
« no previous file with comments | « chrome/browser/extensions/extension_host.h ('k') | chrome/browser/extensions/extension_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698