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

4 files changed, 8 insertions, 8 deletions

diff --git a/chrome/plugin/plugin_channel.cc b/chrome/plugin/plugin_channel.cc
index f14300f..5d6143e 100644
--- a/chrome/plugin/plugin_channel.cc
+++ b/chrome/plugin/plugin_channel.cc
@@ -14,8 +14,8 @@
 
 PluginChannel* PluginChannel::GetPluginChannel(MessageLoop* ipc_message_loop) {
   static int next_id;
-  std::wstring channel_name = StringPrintf(
-      L"%d.r%d", base::GetCurrentProcId(), ++next_id);
+  std::string channel_name = StringPrintf(
+      "%d.r%d", base::GetCurrentProcId(), ++next_id);
 
   return static_cast<PluginChannel*>(PluginChannelBase::GetChannel(
       channel_name,
diff --git a/chrome/plugin/plugin_channel_base.cc b/chrome/plugin/plugin_channel_base.cc
index bdc04b7..d939a179 100644
--- a/chrome/plugin/plugin_channel_base.cc
+++ b/chrome/plugin/plugin_channel_base.cc
@@ -8,14 +8,14 @@
 #include "chrome/common/child_process.h"
 #include "chrome/common/ipc_sync_message.h"
 
-typedef base::hash_map<std::wstring, scoped_refptr<PluginChannelBase> >
+typedef base::hash_map<std::string, scoped_refptr<PluginChannelBase> >
     PluginChannelMap;
 
 static PluginChannelMap g_plugin_channels_;
 
 
 PluginChannelBase* PluginChannelBase::GetChannel(
-    const std::wstring& channel_name, IPC::Channel::Mode mode,
+    const std::string& channel_name, IPC::Channel::Mode mode,
     PluginChannelFactory factory, MessageLoop* ipc_message_loop,
     bool create_pipe_now) {
   scoped_refptr<PluginChannelBase> channel;
diff --git a/chrome/plugin/plugin_channel_base.h b/chrome/plugin/plugin_channel_base.h
index c0f357c..7cb816a 100644
--- a/chrome/plugin/plugin_channel_base.h
+++ b/chrome/plugin/plugin_channel_base.h
@@ -35,7 +35,7 @@ class PluginChannelBase : public IPC::Channel::Listener,
   virtual bool Send(IPC::Message* msg);
 
   int peer_pid() { return peer_pid_; }
-  std::wstring channel_name() const { return channel_name_; }
+  std::string channel_name() const { return channel_name_; }
 
   // Returns the number of open plugin channels in this process.
   static int Count();
@@ -60,7 +60,7 @@ class PluginChannelBase : public IPC::Channel::Listener,
   // must still ref count the returned value.  When there are no more routes
   // on the channel and its ref count is 0, the object deletes itself.
   static PluginChannelBase* GetChannel(
-      const std::wstring& channel_name, IPC::Channel::Mode mode,
+      const std::string& channel_name, IPC::Channel::Mode mode,
       PluginChannelFactory factory, MessageLoop* ipc_message_loop,
       bool create_pipe_now);
 
@@ -88,7 +88,7 @@ class PluginChannelBase : public IPC::Channel::Listener,
  private:
 
   IPC::Channel::Mode mode_;
-  std::wstring channel_name_;
+  std::string channel_name_;
   int plugin_count_;
   int peer_pid_;
 
diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc
index 7c6a905..8f71662 100644
--- a/chrome/plugin/plugin_thread.cc
+++ b/chrome/plugin/plugin_thread.cc
@@ -98,7 +98,7 @@ void PluginThread::CleanUp() {
 }
 
 void PluginThread::OnCreateChannel(bool off_the_record) {
-  std::wstring channel_name;
+  std::string channel_name;
   scoped_refptr<PluginChannel> channel =
       PluginChannel::GetPluginChannel(owner_loop());
   if (channel.get()) {