Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1609)

Unified Diff: chrome/browser/browser_main.cc

Issue 7638: Construct a field trial to see if HIGH or MEDIUM memory model "works better"... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browser.vcproj ('k') | chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_main.cc
===================================================================
--- chrome/browser/browser_main.cc (revision 3603)
+++ chrome/browser/browser_main.cc (working copy)
@@ -24,6 +24,7 @@
#include "chrome/browser/browser_prefs.h"
#include "chrome/browser/browser_process_impl.h"
#include "chrome/browser/browser_shutdown.h"
+#include "chrome/browser/browser_trial.h"
#include "chrome/browser/cert_store.h"
#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
#include "chrome/browser/first_run.h"
@@ -238,7 +239,7 @@
std::transform(user_exe_path.begin(), user_exe_path.end(),
user_exe_path.begin(), tolower);
if (exe == user_exe_path) {
- const std::wstring text =
+ const std::wstring text =
l10n_util::GetString(IDS_MACHINE_LEVEL_INSTALL_CONFLICT);
const std::wstring caption = l10n_util::GetString(IDS_PRODUCT_NAME);
const UINT flags = MB_OK | MB_ICONERROR | MB_TOPMOST;
@@ -280,6 +281,9 @@
MessageLoop main_message_loop(MessageLoop::TYPE_UI);
+ // Initialize statistical testing infrastructure.
+ FieldTrialList field_trial;
+
std::wstring app_name = chrome::kBrowserAppName;
std::string thread_name_string = WideToASCII(app_name + L"_BrowserMain");
@@ -320,7 +324,7 @@
bool is_first_run = FirstRun::IsChromeFirstRun() ||
parsed_command_line.HasSwitch(switches::kFirstRun);
- bool first_run_ui_bypass = false;
+ bool first_run_ui_bypass = false;
// Initialize ResourceBundle which handles files loaded from external
// sources. This has to be done before uninstall code path and before prefs
@@ -339,7 +343,7 @@
local_state->SetBoolean(prefs::kMetricsReportingEnabled, true);
// On first run, we need to process the master preferences before the
// browser's profile_manager object is created.
- FirstRun::MasterPrefResult master_pref_res =
+ FirstRun::MasterPrefResult master_pref_res =
FirstRun::ProcessMasterPreferences(user_data_dir, std::wstring());
first_run_ui_bypass =
(master_pref_res == FirstRun::MASTER_PROFILE_NO_FIRST_RUN_UI);
@@ -505,7 +509,7 @@
ShellIntegration::VerifyInstallation();
browser_process->InitBrokerServices(broker_services);
-
+
// In unittest mode, this will do nothing. In normal mode, this will create
// the global GoogleURLTracker instance, which will promptly go to sleep for
// five seconds (to avoid slowing startup), and wake up afterwards to see if
@@ -544,10 +548,9 @@
}
metrics = browser_process->metrics_service();
DCHECK(metrics);
-
- // If we're testing then we don't care what the user
- // preference is, we turn on recording, but not reporting, otherwise tests
- // fail.
+
+ // If we're testing then we don't care what the user preference is, we turn
+ // on recording, but not reporting, otherwise tests fail.
if (parsed_command_line.HasSwitch(switches::kMetricsRecordingOnly)) {
metrics->StartRecordingOnly();
} else {
« no previous file with comments | « chrome/browser/browser.vcproj ('k') | chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698