diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 01:46:59 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 01:46:59 +0000 |
| commit | ed578097fa1a348906fdd74ea32bf140c8f75071 (patch) | |
| tree | 46decb9874a9573f64a3a86893a7dec063fa97fb /chrome/browser | |
| parent | abb4e8e1ecd63ce8d80e7ab514b748c2cbf201b8 (diff) | |
| download | chromium_src-ed578097fa1a348906fdd74ea32bf140c8f75071.zip chromium_src-ed578097fa1a348906fdd74ea32bf140c8f75071.tar.gz chromium_src-ed578097fa1a348906fdd74ea32bf140c8f75071.tar.bz2 | |
Remove GetSwitchValue() from chrome/* where easy.
Review URL: http://codereview.chromium.org/3057033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/first_run/first_run_win.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/safe_browsing/filter_false_positive_perftest.cc | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index d38636f..06d4a3c 100644 --- a/chrome/browser/first_run/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -274,8 +274,8 @@ bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir, FilePath inner_html; if (WriteEULAtoTempFile(&inner_html)) { int retcode = 0; - const std::string eula = WideToASCII(installer_util::switches::kShowEula); - if (!LaunchSetupWithParam(eula, inner_html.ToWStringHack(), &retcode) || + if (!LaunchSetupWithParam(installer_util::switches::kShowEula, + inner_html.ToWStringHack(), &retcode) || (retcode == installer_util::EULA_REJECTED)) { LOG(WARNING) << "EULA rejected. Fast exit."; ::ExitProcess(1); diff --git a/chrome/browser/safe_browsing/filter_false_positive_perftest.cc b/chrome/browser/safe_browsing/filter_false_positive_perftest.cc index 9cc1b53..f763b51c 100644 --- a/chrome/browser/safe_browsing/filter_false_positive_perftest.cc +++ b/chrome/browser/safe_browsing/filter_false_positive_perftest.cc @@ -345,8 +345,9 @@ TEST(SafeBrowsingBloomFilter, HashTime) { int num_checks = kNumHashChecks; if (cmd_line.HasSwitch(kFilterNumChecks)) { - ASSERT_TRUE(base::StringToInt(cmd_line.GetSwitchValue(kFilterNumChecks), - &num_checks)); + ASSERT_TRUE( + base::StringToInt(cmd_line.GetSwitchValueASCII(kFilterNumChecks), + &num_checks)); } // Populate the bloom filter and measure the time. |