| Index: chrome/browser/chrome_browser_main.cc
|
| diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
|
| index dcf863d1f89a10a9078d6d48ac2a5a09f7b5e334..73960ef127d796a736f6889f48de41f5f62323a0 100644
|
| --- a/chrome/browser/chrome_browser_main.cc
|
| +++ b/chrome/browser/chrome_browser_main.cc
|
| @@ -430,7 +430,8 @@ Profile* CreatePrimaryProfile(const content::MainFunctionParams& parameters,
|
| // TODO(port): fix this. See comments near the definition of |user_data_dir|.
|
| // It is better to CHECK-fail here than it is to silently exit because of
|
| // missing code in the above test.
|
| - CHECK(profile) << "Cannot get default profile.";
|
| + // Cannot get default profile.
|
| + CHECK(profile);
|
|
|
| #else
|
| profile = GetStartupProfile(user_data_dir, parsed_command_line);
|
| @@ -676,9 +677,7 @@ void ChromeBrowserMainParts::SetupFieldTrials() {
|
| bool result = variations::AssociateParamsFromString(
|
| command_line->GetSwitchValueASCII(
|
| variations::switches::kForceFieldTrialParams));
|
| - CHECK(result) << "Invalid --"
|
| - << variations::switches::kForceFieldTrialParams
|
| - << " list specified.";
|
| + CHECK(result);
|
| }
|
|
|
| // Ensure any field trials specified on the command line are initialized.
|
| @@ -693,8 +692,7 @@ void ChromeBrowserMainParts::SetupFieldTrials() {
|
| bool result = base::FieldTrialList::CreateTrialsFromString(
|
| command_line->GetSwitchValueASCII(switches::kForceFieldTrials),
|
| unforceable_field_trials);
|
| - CHECK(result) << "Invalid --" << switches::kForceFieldTrials
|
| - << " list specified.";
|
| + CHECK(result);
|
| }
|
|
|
| std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
|
| @@ -713,8 +711,7 @@ void ChromeBrowserMainParts::SetupFieldTrials() {
|
| bool result = http_header_provider->ForceVariationIds(
|
| command_line->GetSwitchValueASCII(switches::kForceVariationIds),
|
| &variation_ids);
|
| - CHECK(result) << "Invalid list of variation ids specified (either in --"
|
| - << switches::kForceVariationIds << " or in chrome://flags)";
|
| + CHECK(result);
|
|
|
| feature_list->InitializeFromCommandLine(
|
| command_line->GetSwitchValueASCII(switches::kEnableFeatures),
|
| @@ -1091,7 +1088,8 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
| ShowMissingLocaleMessageBox();
|
| return chrome::RESULT_CODE_MISSING_DATA;
|
| }
|
| - CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
|
| + // Locale could not be found for |locale|.
|
| + CHECK(!loaded_locale.empty());
|
| browser_process_->SetApplicationLocale(loaded_locale);
|
|
|
| {
|
|
|