diff options
| author | bbudge@google.com <bbudge@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 23:14:16 +0000 |
|---|---|---|
| committer | bbudge@google.com <bbudge@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 23:14:16 +0000 |
| commit | 66c3cb0e9f8f58dbd258e6d31ba8bac5127b55f0 (patch) | |
| tree | 152e32852a13f1903590918bd5cd68af92b51b4a /chrome/browser/browser_main.cc | |
| parent | bda50cd99291986fc13befc0aa8a62d247dceef7 (diff) | |
| download | chromium_src-66c3cb0e9f8f58dbd258e6d31ba8bac5127b55f0.zip chromium_src-66c3cb0e9f8f58dbd258e6d31ba8bac5127b55f0.tar.gz chromium_src-66c3cb0e9f8f58dbd258e6d31ba8bac5127b55f0.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.
This is a release blocker for NaCl, so we decided to push this through.
TEST=manual
BUG= http://code.google.com/p/nativeclient/issues/detail?id=1322
Review URL: http://codereview.chromium.org/6267009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72225 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index ed8764c..a6866ea 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -1244,6 +1244,10 @@ int BrowserMain(const MainFunctionParams& parameters) { // Initialize the prefs of the local state. browser::RegisterLocalState(local_state); + // Convert active labs into switches. Modifies the current command line. + about_flags::ConvertFlagsToSwitches(local_state, + CommandLine::ForCurrentProcess()); + // Now that all preferences have been registered, set the install date // for the uninstall metrics if this is our first run. This only actually // gets used if the user has metrics reporting enabled at uninstall time. @@ -1579,7 +1583,7 @@ int BrowserMain(const MainFunctionParams& parameters) { HandleTestParameters(parsed_command_line); RecordBreakpadStatusUMA(metrics); - about_flags::RecordUMAStatistics(user_prefs); + about_flags::RecordUMAStatistics(local_state); // Stat the directory with the inspector's files so that we can know if we // should display the entry in the context menu or not. |