Ensure that --disable-extensions disables extension prefs from being enacted

chrome/browser/profiles/profile_impl.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/profiles/profile_impl.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/file_path.h"
@@ skipping 914 matching lines @@
 
   // The last session exited cleanly if there is no pref for
   // kSessionExitedCleanly or the value for kSessionExitedCleanly is true.
   last_session_exited_cleanly_ =
       prefs_->GetBoolean(prefs::kSessionExitedCleanly);
   // Mark the session as open.
   prefs_->SetBoolean(prefs::kSessionExitedCleanly, false);
   // Make sure we save to disk that the session has opened.
   prefs_->ScheduleSavePersistentPrefs();
 
+  bool extensions_disabled =
+      (prefs_->FindPreference(prefs::kDisableExtensions) &&
+       prefs_->GetBoolean(prefs::kDisableExtensions)) ||
+      CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableExtensions);

[Mattias Nissler (ping if slow), 2011/09/29 12:20:07]

Hm, maybe handle the switch in CommandLinePrefStore so client code doesn't have
to check both the pref and the switch?

[battre, 2011/09/29 14:50:18]

I looked into this and decided against it: It would be nice in principle but it
would create inconsistencies with other switches that are not handled via the
command line pref store (switches::kExtensionsUpdateFrequency,
switches::kDisableExtensionsFileAccessCheck).

+
   // Ensure that preferences set by extensions are restored in the profile
   // as early as possible. The constructor takes care of that.
   extension_prefs_.reset(new ExtensionPrefs(
       prefs_.get(),
       GetPath().AppendASCII(ExtensionService::kInstallDirectoryName),
-      GetExtensionPrefValueMap()));
+      GetExtensionPrefValueMap(),
+      extensions_disabled));
 
   ProfileDependencyManager::GetInstance()->CreateProfileServices(this, false);
 
   DCHECK(!net_pref_observer_.get());
   net_pref_observer_.reset(
       new NetPrefObserver(prefs_.get(), GetPrerenderManager(), predictor_));
 
   DoFinalInit();
 }
 
@@ skipping 813 matching lines @@
 SpellCheckProfile* ProfileImpl::GetSpellCheckProfile() {
   if (!spellcheck_profile_.get())
     spellcheck_profile_.reset(new SpellCheckProfile());
   return spellcheck_profile_.get();
 }
 
 void ProfileImpl::SetDownloadManagerDelegate(
     ChromeDownloadManagerDelegate* delegate) {
   download_manager_delegate_ = delegate;
 }