summaryrefslogtreecommitdiffstats
path: root/chrome/test/plugin
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-02 00:56:57 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-02 00:56:57 +0000
commit4b68e0d50c4a69b91a384b698a96f6a51ca7241f (patch)
treea11dc1b6baf8d2e1d1c3d8b7930fb9ca0cec46eb /chrome/test/plugin
parent82d10b14f9b4150ce1e154629dec9dcddadcf272 (diff)
downloadchromium_src-4b68e0d50c4a69b91a384b698a96f6a51ca7241f.zip
chromium_src-4b68e0d50c4a69b91a384b698a96f6a51ca7241f.tar.gz
chromium_src-4b68e0d50c4a69b91a384b698a96f6a51ca7241f.tar.bz2
Yet more deprecation of the wstring version of PathService::Get() for UI tests.
Review URL: http://codereview.chromium.org/99298 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/plugin')
-rw-r--r--chrome/test/plugin/plugin_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp
index d8461fd..babf0bd 100644
--- a/chrome/test/plugin/plugin_test.cpp
+++ b/chrome/test/plugin/plugin_test.cpp
@@ -193,7 +193,7 @@ class ActiveXTest : public PluginTest {
RegisterTestControl(false);
}
void RegisterTestControl(bool register_server) {
- std::wstring test_control_path = browser_directory_ +
+ std::wstring test_control_path = browser_directory_.ToWStringHack() +
L"\\activex_test_control.dll";
HMODULE h = LoadLibrary(test_control_path.c_str());
ASSERT_TRUE(h != NULL) << "Failed to load activex_test_control.dll";