| Index: chrome/common/child_thread.cc
 | 
| ===================================================================
 | 
| --- chrome/common/child_thread.cc	(revision 31117)
 | 
| +++ chrome/common/child_thread.cc	(working copy)
 | 
| @@ -17,9 +17,8 @@
 | 
|  
 | 
|  
 | 
|  ChildThread::ChildThread() {
 | 
| -  channel_name_ = WideToASCII(
 | 
| -      CommandLine::ForCurrentProcess()->GetSwitchValue(
 | 
| -          switches::kProcessChannelID));
 | 
| +  channel_name_ = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
 | 
| +      switches::kProcessChannelID);
 | 
|    Init();
 | 
|  }
 | 
|  
 | 
| @@ -32,9 +31,9 @@
 | 
|    check_with_browser_before_shutdown_ = false;
 | 
|    message_loop_ = MessageLoop::current();
 | 
|    if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUserAgent)) {
 | 
| -    webkit_glue::SetUserAgent(WideToUTF8(
 | 
| -        CommandLine::ForCurrentProcess()->GetSwitchValue(
 | 
| -            switches::kUserAgent)));
 | 
| +    webkit_glue::SetUserAgent(
 | 
| +        CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
 | 
| +            switches::kUserAgent));
 | 
|    }
 | 
|  
 | 
|    channel_.reset(new IPC::SyncChannel(channel_name_,
 | 
| 
 |