Refactor code that defers extension background page loading

chrome/browser/extensions/chrome_extensions_browser_client.cc

 // Copyright 2013 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/chrome_extensions_browser_client.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/version.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
@@ skipping 144 matching lines @@
     std::vector<ExtensionPrefsObserver*>* observers) const {
 #if defined(ENABLE_EXTENSIONS)
   observers->push_back(ContentSettingsService::Get(context));
 #endif
 }
 
 bool ChromeExtensionsBrowserClient::DeferLoadingBackgroundHosts(
     content::BrowserContext* context) const {
   Profile* profile = static_cast<Profile*>(context);
 
+  // Defer forever if current session is a Guest mode session and current
+  // browser context is *not* off-the-record. Such context is artificial and
+  // background page shouldn't be created in it.
+  if (profile->IsGuestSession() && !profile->IsOffTheRecord())
+    return true;
+
   // The profile may not be valid yet if it is still being initialized.
   // In that case, defer loading, since it depends on an initialized profile.
+  // Background hosts will be loaded later via NOTIFICATION_PROFILE_CREATED
+  // in ChromeNotificationObserver.
   // http://crbug.com/222473
   if (!g_browser_process->profile_manager()->IsValidProfile(profile))
     return true;
 
 #if defined(OS_ANDROID)
   return false;
 #else
   // There are no browser windows open and the browser process was
-  // started to show the app launcher.
+  // started to show the app launcher. Background hosts will be loaded later
+  // via NOTIFICATION_BROWSER_WINDOW_READY in ChromeNotificationObserver.
   return chrome::GetTotalBrowserCountForProfile(profile) == 0 &&
          CommandLine::ForCurrentProcess()->HasSwitch(switches::kShowAppList);
 #endif
 }
 
 bool ChromeExtensionsBrowserClient::IsBackgroundPageAllowed(
     content::BrowserContext* context) const {
-  // Returns true if current session is Guest mode session and current
-  // browser context is *not* off-the-record. Such context is artificial and
-  // background page shouldn't be created in it.
-  return !static_cast<Profile*>(context)->IsGuestSession() ||
-         context->IsOffTheRecord();
+//JAMES remove me
+  return true;
 }
 
 scoped_ptr<ExtensionHostDelegate>
 ChromeExtensionsBrowserClient::CreateExtensionHostDelegate() {
   return scoped_ptr<ExtensionHostDelegate>(new ChromeExtensionHostDelegate);
 }
 
 bool ChromeExtensionsBrowserClient::DidVersionUpdate(
     content::BrowserContext* context) {
   Profile* profile = static_cast<Profile*>(context);
@@ skipping 89 matching lines @@
     content::BrowserContext* context) const {
 #if defined(ENABLE_EXTENSIONS)
   return scoped_ptr<extensions::RuntimeAPIDelegate>(
       new ChromeRuntimeAPIDelegate(context));
 #else
   return scoped_ptr<extensions::RuntimeAPIDelegate>();
 #endif
 }
 
 }  // namespace extensions