summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-08 22:18:37 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-08 22:18:37 +0000
commit711a353ad1d530fb05da259bf3b6011f6a974ecf (patch)
tree9e41a04cb0245620162cf1440eca12642d884278 /chrome_frame
parent3f40a6ae6f0f2889a9ef4ad70c44c79590228f3a (diff)
downloadchromium_src-711a353ad1d530fb05da259bf3b6011f6a974ecf.zip
chromium_src-711a353ad1d530fb05da259bf3b6011f6a974ecf.tar.gz
chromium_src-711a353ad1d530fb05da259bf3b6011f6a974ecf.tar.bz2
Get rid of std::wstring version of HasSwitch.
BUG=24672 TEST=trybots Review URL: http://codereview.chromium.org/5649003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/net/fake_external_tab.cc4
-rw-r--r--chrome_frame/test/net/test_automation_provider.cc2
-rw-r--r--chrome_frame/test/run_all_unittests.cc2
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 76fd313..c5625c2 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -45,12 +45,12 @@ namespace {
// A special command line switch to allow developers to manually launch the
// browser and debug CF inside the browser.
-const wchar_t kManualBrowserLaunch[] = L"manual-browser";
+const char kManualBrowserLaunch[] = "manual-browser";
// Pops up a message box after the test environment has been set up
// and before tearing it down. Useful for when debugging tests and not
// the test environment that's been set up.
-const wchar_t kPromptAfterSetup[] = L"prompt-after-setup";
+const char kPromptAfterSetup[] = "prompt-after-setup";
const int kTestServerPort = 4666;
// The test HTML we use to initialize Chrome Frame.
diff --git a/chrome_frame/test/net/test_automation_provider.cc b/chrome_frame/test/net/test_automation_provider.cc
index 2e7c76e..85246cc 100644
--- a/chrome_frame/test/net/test_automation_provider.cc
+++ b/chrome_frame/test/net/test_automation_provider.cc
@@ -14,7 +14,7 @@ namespace {
// A special command line switch to just run the unit tests without CF in
// the picture. Can be useful when the harness itself needs to be debugged.
-const wchar_t kNoCfTestRun[] = L"no-cf-test-run";
+const char kNoCfTestRun[] = "no-cf-test-run";
bool CFTestsDisabled() {
static bool switch_present = CommandLine::ForCurrentProcess()->
diff --git a/chrome_frame/test/run_all_unittests.cc b/chrome_frame/test/run_all_unittests.cc
index 2c90a70..1b2357e 100644
--- a/chrome_frame/test/run_all_unittests.cc
+++ b/chrome_frame/test/run_all_unittests.cc
@@ -23,7 +23,7 @@ class ChromeFrameUnittestsModule
ChromeFrameUnittestsModule _AtlModule;
-const wchar_t kNoRegistrationSwitch[] = L"no-registration";
+const char kNoRegistrationSwitch[] = "no-registration";
void PureCall() {
__debugbreak();