summaryrefslogtreecommitdiffstats
path: root/chrome/test/tab_switching/tab_switching_test.cc
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-06 18:50:51 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-06 18:50:51 +0000
commitc83dd9152c88cc9cb2dcdc6c68da651516dc9715 (patch)
tree22cf90855386d9946633963f943066f309820f47 /chrome/test/tab_switching/tab_switching_test.cc
parentab9cd716eecd0153a111b19d3f60e4b1cc4e58ae (diff)
downloadchromium_src-c83dd9152c88cc9cb2dcdc6c68da651516dc9715.zip
chromium_src-c83dd9152c88cc9cb2dcdc6c68da651516dc9715.tar.gz
chromium_src-c83dd9152c88cc9cb2dcdc6c68da651516dc9715.tar.bz2
Convert variables in chrome/common/env_vars.cc from wchar_t to char. Enable ChromeLoggingTest along the way.
BUG=none TEST=none Review URL: http://codereview.chromium.org/1559016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/tab_switching/tab_switching_test.cc')
-rw-r--r--chrome/test/tab_switching/tab_switching_test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/test/tab_switching/tab_switching_test.cc b/chrome/test/tab_switching/tab_switching_test.cc
index 74c6f25..4f74c6e 100644
--- a/chrome/test/tab_switching/tab_switching_test.cc
+++ b/chrome/test/tab_switching/tab_switching_test.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -44,10 +44,10 @@ class TabSwitchingUITest : public UITest {
// Set the log file path for the browser test.
#if defined(OS_WIN)
- SetEnvironmentVariable(env_vars::kLogFileName,
+ SetEnvironmentVariable(UTF8ToWide(env_vars::kLogFileName).c_str(),
log_file_name_.value().c_str());
#else
- setenv(WideToASCII(env_vars::kLogFileName).c_str(),
+ setenv(env_vars::kLogFileName,
log_file_name_.value().c_str(), 1);
#endif