diff options
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/net/process_singleton_subclass.cc | 5 | ||||
| -rw-r--r-- | chrome_frame/test/reliability/page_load_test.cc | 20 | ||||
| -rw-r--r-- | chrome_frame/test/reliability/run_all_unittests.cc | 2 |
3 files changed, 11 insertions, 16 deletions
diff --git a/chrome_frame/test/net/process_singleton_subclass.cc b/chrome_frame/test/net/process_singleton_subclass.cc index 89ddeb9..2046e0b 100644 --- a/chrome_frame/test/net/process_singleton_subclass.cc +++ b/chrome_frame/test/net/process_singleton_subclass.cc @@ -100,9 +100,8 @@ LRESULT ProcessSingletonSubclass::OnCopyData(HWND hwnd, HWND from_hwnd, std::wstring cmd_line(begin, static_cast<size_t>(end - begin)); CommandLine parsed_command_line = CommandLine::FromString(cmd_line); - std::string channel_id = - parsed_command_line.GetSwitchValueASCII( - switches::kAutomationClientChannelID)); + std::string channel_id(WideToASCII(parsed_command_line.GetSwitchValue( + switches::kAutomationClientChannelID))); EXPECT_FALSE(channel_id.empty()); delegate_->OnConnectAutomationProviderToChannel(channel_id); diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index 61268fc..f784bcf 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/chrome_frame/test/reliability/page_load_test.cc @@ -562,17 +562,15 @@ void SetPageRange(const CommandLine& parsed_command_line) { if (parsed_command_line.HasSwitch(kStartIndexSwitch)) { ASSERT_TRUE( - base::StringToInt(parsed_command_line.GetSwitchValue( - kStartIndexSwitch), - &g_start_index)); + base::StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue( + kStartIndexSwitch)), &g_start_index)); ASSERT_GT(g_start_index, 0); } if (parsed_command_line.HasSwitch(kEndIndexSwitch)) { ASSERT_TRUE( - base::StringToInt(parsed_command_line.GetSwitchValue( - kEndIndexSwitch), - &g_end_index)); + base::StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue( + kEndIndexSwitch)), &g_end_index)); ASSERT_GT(g_end_index, 0); } @@ -583,9 +581,8 @@ void SetPageRange(const CommandLine& parsed_command_line) { if (parsed_command_line.HasSwitch(kIterationSwitch)) { ASSERT_TRUE( - base::StringToInt(parsed_command_line.GetSwitchValue( - kIterationSwitch), - &g_iterations)); + base::StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue( + kIterationSwitch)), &g_iterations)); ASSERT_GT(g_iterations, 0); } @@ -600,9 +597,8 @@ void SetPageRange(const CommandLine& parsed_command_line) { if (parsed_command_line.HasSwitch(kTimeoutSwitch)) { ASSERT_TRUE( - base::StringToInt(parsed_command_line.GetSwitchValue( - kTimeoutSwitch), - &g_timeout_ms)); + base::StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue( + kTimeoutSwitch)), &g_timeout_ms)); ASSERT_GT(g_timeout_ms, 0); } diff --git a/chrome_frame/test/reliability/run_all_unittests.cc b/chrome_frame/test/reliability/run_all_unittests.cc index d153d68..3b2604d 100644 --- a/chrome_frame/test/reliability/run_all_unittests.cc +++ b/chrome_frame/test/reliability/run_all_unittests.cc @@ -29,7 +29,7 @@ int main(int argc, char **argv) { int result = -1; if (cmd_line->HasSwitch(kRegisterDllFlag)) { - std::wstring dll_path = cmd_line->GetSwitchValueNative(kRegisterDllFlag); + std::wstring dll_path = cmd_line->GetSwitchValue(kRegisterDllFlag); // Run() must be called within the scope of the ScopedChromeFrameRegistrar // to ensure that the correct DLL remains registered during the tests. |