diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/sessions/session_restore_uitest.cc | 4 | ||||
| -rw-r--r-- | chrome/installer/util/google_chrome_distribution.cc | 2 | ||||
| -rw-r--r-- | chrome/test/in_process_browser_test.cc | 3 | ||||
| -rw-r--r-- | chrome/test/startup/startup_test.cc | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc index 5e0c487..5b48fa1 100644 --- a/chrome/browser/sessions/session_restore_uitest.cc +++ b/chrome/browser/sessions/session_restore_uitest.cc @@ -38,8 +38,8 @@ class SessionRestoreUITest : public UITest { clear_profile_ = false; - launch_arguments_.AppendSwitchWithValue(switches::kRestoreLastSession, - IntToWString(expected_tab_count)); + launch_arguments_.AppendSwitchASCII(switches::kRestoreLastSession, + IntToString(expected_tab_count)); UITest::SetUp(); } diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc index f1bad6f..e9dff40 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -130,7 +130,7 @@ int GetDirectoryWriteAgeInHours(const wchar_t* path) { bool RelaunchSetup(const std::wstring& flag, int value, bool system_level_toast) { CommandLine cmd_line(CommandLine::ForCurrentProcess()->GetProgram()); - cmd_line.AppendSwitchWithValue(WideToASCII(flag), IntToWString(value)); + cmd_line.AppendSwitchASCII(WideToASCII(flag), IntToString(value)); if (system_level_toast) cmd_line.AppendSwitch( WideToASCII(installer_util::switches::kSystemLevelToast)); diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc index 4d2fb9b..132c6ed 100644 --- a/chrome/test/in_process_browser_test.cc +++ b/chrome/test/in_process_browser_test.cc @@ -169,8 +169,7 @@ void InProcessBrowserTest::SetUp() { // Enable warning level logging so that we can see when bad stuff happens. command_line->AppendSwitch(switches::kEnableLogging); - command_line->AppendSwitchWithValue(switches::kLoggingLevel, - IntToWString(1)); // warning + command_line->AppendSwitchASCII(switches::kLoggingLevel, "1"); // warning // If ncecessary, disable TabCloseableStateWatcher. if (!tab_closeable_state_watcher_enabled_) diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc index 7f6f47f..a4ec1b9 100644 --- a/chrome/test/startup/startup_test.cc +++ b/chrome/test/startup/startup_test.cc @@ -282,8 +282,8 @@ void StartupTest::RunPerfTestWithManyTabs(const char* graph, const char* trace, // The session will be restored once per cycle for numCycles test cycles, // and each time, UITest::SetUp will wait for |tab_count| tabs to // finish loading. - launch_arguments_.AppendSwitchWithValue(switches::kRestoreLastSession, - IntToWString(tab_count)); + launch_arguments_.AppendSwitchASCII(switches::kRestoreLastSession, + IntToString(tab_count)); } RunStartupTest(graph, trace, WARM, NOT_IMPORTANT, UITest::DEFAULT_THEME, tab_count, nth_timed_tab); |