The extensions service wasn't getting inited despite being used by themes (th...

chrome/browser/profile.cc

 // Copyright (c) 2006-2008 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/profile.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 413 matching lines @@
 
 void ProfileImpl::InitExtensions() {
   if (user_script_master_ || extensions_service_)
     return;  // Already initialized.
 
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   PrefService* prefs = GetPrefs();
   bool user_scripts_enabled =
       command_line->HasSwitch(switches::kEnableUserScripts) ||
       prefs->GetBoolean(prefs::kEnableUserScripts);
-  bool extensions_enabled =
-      command_line->HasSwitch(switches::kEnableExtensions) ||
-      prefs->GetBoolean(prefs::kEnableExtensions);
 
   FilePath script_dir;
   if (user_scripts_enabled) {
     if (command_line->HasSwitch(switches::kUserScriptsDir)) {
       std::wstring path_string =
           command_line->GetSwitchValue(switches::kUserScriptsDir);
       script_dir = FilePath::FromWStringHack(path_string);
     } else {
       script_dir = GetPath();
       script_dir = script_dir.Append(chrome::kUserScriptsDirname);
     }
   }
 
   ExtensionErrorReporter::Init(true);  // allow noisy errors.
   user_script_master_ = new UserScriptMaster(
-      g_browser_process->file_thread()->message_loop(), script_dir);
+      g_browser_process->file_thread()->message_loop(),
+      script_dir);
   extensions_service_ = new ExtensionsService(
       this, MessageLoop::current(),
       g_browser_process->file_thread()->message_loop(),
       std::string());  // Use default registry path
 
-  // If we have extensions, the extension service will kick off the first scan
-  // after extensions are loaded. Otherwise, we need to do that now.
-  if (extensions_enabled)
-    extensions_service_->Init();
-  else if (user_scripts_enabled)
-    user_script_master_->StartScan();
+  extensions_service_->Init();
 }
 
 ProfileImpl::~ProfileImpl() {
   tab_restore_service_ = NULL;
 
   StopCreateSessionServiceTimer();
   // TemplateURLModel schedules a task on the WebDataService from its
   // destructor. Delete it first to ensure the task gets scheduled before we
   // shut down the database.
   template_url_model_.reset();
@@ skipping 514 matching lines @@
 
 void ProfileImpl::StopCreateSessionServiceTimer() {
   create_session_service_timer_.Stop();
 }
 
 #ifdef CHROME_PERSONALIZATION
 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() {
   return personalization_.get();
 }
 #endif