diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-13 02:07:25 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-13 02:07:25 +0000 |
commit | b7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78 (patch) | |
tree | d723b8556ad386a0b8a6e999e3a842e0bfe6f9b0 /chrome/test/url_fetch_test | |
parent | 1976d41ac728fcceb30f2df3c243cb7417f538f1 (diff) | |
download | chromium_src-b7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78.zip chromium_src-b7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78.tar.gz chromium_src-b7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78.tar.bz2 |
Use ASCII strings for switch names.
Review URL: http://codereview.chromium.org/270062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/url_fetch_test')
-rw-r--r-- | chrome/test/url_fetch_test/url_fetch_test.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/test/url_fetch_test/url_fetch_test.cc b/chrome/test/url_fetch_test/url_fetch_test.cc index 75be5ab..ed70f20 100644 --- a/chrome/test/url_fetch_test/url_fetch_test.cc +++ b/chrome/test/url_fetch_test/url_fetch_test.cc @@ -27,7 +27,7 @@ class UrlFetchTest : public UITest { void SetUp() { const CommandLine *cmdLine = CommandLine::ForCurrentProcess(); - if (cmdLine->HasSwitch(L"reference_build")) { + if (cmdLine->HasSwitch("reference_build")) { FilePath dir; PathService::Get(chrome::DIR_TEST_TOOLS, &dir); dir = dir.AppendASCII("reference_build"); @@ -109,19 +109,19 @@ bool writeValueToFile(std::string value, std::wstring filePath) { TEST_F(UrlFetchTest, UrlFetch) { const CommandLine *cmdLine = CommandLine::ForCurrentProcess(); - if (!cmdLine->HasSwitch(L"url")) { + if (!cmdLine->HasSwitch("url")) { return; } std::string cookieName = - WideToASCII(cmdLine->GetSwitchValue(L"wait_cookie_name")); + cmdLine->GetSwitchValueASCII("wait_cookie_name"); std::string cookieValue = - WideToASCII(cmdLine->GetSwitchValue(L"wait_cookie_value")); + cmdLine->GetSwitchValueASCII("wait_cookie_value"); - std::wstring jsvar = cmdLine->GetSwitchValue(L"jsvar"); + std::wstring jsvar = cmdLine->GetSwitchValue("jsvar"); UrlFetchTestResult result; - RunTest(GURL(WideToASCII(cmdLine->GetSwitchValue(L"url"))), + RunTest(GURL(WideToASCII(cmdLine->GetSwitchValue("url"))), cookieName.length() > 0 ? cookieName.c_str() : NULL, cookieValue.length() > 0 ? cookieValue.c_str() : NULL, jsvar.length() > 0 ? jsvar.c_str() : NULL, @@ -129,13 +129,13 @@ TEST_F(UrlFetchTest, UrlFetch) { // Write out the cookie if requested std::wstring cookieOutputPath = - cmdLine->GetSwitchValue(L"wait_cookie_output"); + cmdLine->GetSwitchValue("wait_cookie_output"); if (cookieOutputPath.length() > 0) { ASSERT_TRUE(writeValueToFile(result.cookie_value, cookieOutputPath)); } // Write out the JS Variable if requested - std::wstring jsvarOutputPath = cmdLine->GetSwitchValue(L"jsvar_output"); + std::wstring jsvarOutputPath = cmdLine->GetSwitchValue("jsvar_output"); if (jsvarOutputPath.length() > 0) { ASSERT_TRUE(writeValueToFile(result.javascript_variable, jsvarOutputPath)); } |