summaryrefslogtreecommitdiffstats
path: root/chrome/test/automation/automation_proxy.h
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-04 22:28:16 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-04 22:28:16 +0000
commit9a3a293b332de07fe81522061fadd8883789ec4a (patch)
tree39e2c276c3a7ef8668884bd02c590c8eccb51aa9 /chrome/test/automation/automation_proxy.h
parentbb050c16657599d3cdee43c8d377ebcca0da64eb (diff)
downloadchromium_src-9a3a293b332de07fe81522061fadd8883789ec4a.zip
chromium_src-9a3a293b332de07fe81522061fadd8883789ec4a.tar.gz
chromium_src-9a3a293b332de07fe81522061fadd8883789ec4a.tar.bz2
ipc: use strings, not wstrings for channel ids.
They're ASCII anyway. TEST=covered by existing tests Review URL: http://codereview.chromium.org/119131 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17682 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation/automation_proxy.h')
-rw-r--r--chrome/test/automation/automation_proxy.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h
index b851a40..b1cec94 100644
--- a/chrome/test/automation/automation_proxy.h
+++ b/chrome/test/automation/automation_proxy.h
@@ -170,7 +170,7 @@ class AutomationProxy : public IPC::Channel::Listener,
// Returns the ID of the automation IPC channel, so that it can be
// passed to the app as a launch parameter.
- const std::wstring& channel_id() const { return channel_id_; }
+ const std::string& channel_id() const { return channel_id_; }
#if defined(OS_POSIX)
base::file_handle_mapping_vector fds_to_map() const;
@@ -222,7 +222,7 @@ class AutomationProxy : public IPC::Channel::Listener,
void InitializeChannel();
void InitializeHandleTracker();
- std::wstring channel_id_;
+ std::string channel_id_;
scoped_ptr<base::Thread> thread_;
scoped_ptr<IPC::SyncChannel> channel_;
scoped_ptr<AutomationHandleTracker> tracker_;