diff options
| author | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-09 06:46:06 +0000 |
|---|---|---|
| committer | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-09 06:46:06 +0000 |
| commit | 313c00e5ed70534d2072e9e4c88016d509a8848b (patch) | |
| tree | c5b98bcdfd319eed0ba04511ff57e0518b182a5a /chrome/test/ui | |
| parent | c230751ba15f1991943b8936d262940593c61e03 (diff) | |
| download | chromium_src-313c00e5ed70534d2072e9e4c88016d509a8848b.zip chromium_src-313c00e5ed70534d2072e9e4c88016d509a8848b.tar.gz chromium_src-313c00e5ed70534d2072e9e4c88016d509a8848b.tar.bz2 | |
Fix NamedProxyLauncher on windows. Wait for the named pipe to be connectable.
Enable NamedInterfaceTest on windows.
BUG=chromium-os:8515
TEST=none
Review URL: http://codereview.chromium.org/7486007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
| -rw-r--r-- | chrome/test/ui/named_interface_uitest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/test/ui/named_interface_uitest.cc b/chrome/test/ui/named_interface_uitest.cc index 0c60cea..3401f71 100644 --- a/chrome/test/ui/named_interface_uitest.cc +++ b/chrome/test/ui/named_interface_uitest.cc @@ -21,13 +21,13 @@ class NamedInterfaceTest : public UITest { } virtual ProxyLauncher *CreateProxyLauncher() { - CommandLine::StringType channel_path = - CommandLine::ForCurrentProcess()->GetSwitchValueNative( + std::string channel_id = + CommandLine::ForCurrentProcess()->GetSwitchValueASCII( switches::kTestingChannel); - if (channel_path.empty()) - channel_path = ProxyLauncher::kDefaultInterfacePath; + if (channel_id.empty()) + channel_id = ProxyLauncher::kDefaultInterfaceId; - return new NamedProxyLauncher(channel_path, true, true); + return new NamedProxyLauncher(channel_id, true, true); } }; |