diff options
| author | bbudge@google.com <bbudge@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 22:28:39 +0000 |
|---|---|---|
| committer | bbudge@google.com <bbudge@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 22:28:39 +0000 |
| commit | 42cbc84334ad96afbdc02695ada603df8a13bb0c (patch) | |
| tree | 94b50658bcc2f9e1aaf66c34ab54d3ef169292e5 /chrome/browser/profiles | |
| parent | c8d20957e55523e173b7edcbdbabddf043eca5fd (diff) | |
| download | chromium_src-42cbc84334ad96afbdc02695ada603df8a13bb0c.zip chromium_src-42cbc84334ad96afbdc02695ada603df8a13bb0c.tar.gz chromium_src-42cbc84334ad96afbdc02695ada603df8a13bb0c.tar.bz2 | |
This patch moves the experiments settings from the user profile to the browser's local state, since these settings correspond to command line switches. It restores 6267009 http://codereview.chromium.org/6267009/ which got reverted because it broke ChromeOS tests. The patch also removes some migration code for ChromeOS experiments. Users' settings should be migrated by now.
This is a release blocker for NaCl, so we are pushing this through.
TEST=manual
BUG= http://code.google.com/p/nativeclient/issues/detail?id=1322
Review URL: http://codereview.chromium.org/6389002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72404 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles')
| -rw-r--r-- | chrome/browser/profiles/profile_impl.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 05e0436..01cd530 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -13,7 +13,6 @@ #include "base/scoped_ptr.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "chrome/browser/about_flags.h" #include "chrome/browser/appcache/chrome_appcache_service.h" #include "chrome/browser/autocomplete/autocomplete_classifier.h" #include "chrome/browser/autofill/personal_data_manager.h" @@ -278,9 +277,6 @@ ProfileImpl::ProfileImpl(const FilePath& path) pref_change_registrar_.Add(prefs::kEnableAutoSpellCorrect, this); pref_change_registrar_.Add(prefs::kClearSiteDataOnExit, this); - // Convert active labs into switches. Modifies the current command line. - about_flags::ConvertFlagsToSwitches(prefs, CommandLine::ForCurrentProcess()); - // It would be nice to use PathService for fetching this directory, but // the cache directory depends on the profile directory, which isn't available // to PathService. |