diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-04 22:28:16 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-04 22:28:16 +0000 |
| commit | 9a3a293b332de07fe81522061fadd8883789ec4a (patch) | |
| tree | 39e2c276c3a7ef8668884bd02c590c8eccb51aa9 /chrome/browser/browser_init.cc | |
| parent | bb050c16657599d3cdee43c8d377ebcca0da64eb (diff) | |
| download | chromium_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/browser/browser_init.cc')
| -rw-r--r-- | chrome/browser/browser_init.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index 9a1760d..91483dc 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -658,8 +658,8 @@ bool BrowserInit::ProcessCmdLineImpl(const CommandLine& command_line, // Look for the testing channel ID ONLY during process startup if (command_line.HasSwitch(switches::kTestingChannelID)) { - std::wstring testing_channel_id = - command_line.GetSwitchValue(switches::kTestingChannelID); + std::string testing_channel_id = WideToASCII( + command_line.GetSwitchValue(switches::kTestingChannelID)); // TODO(sanjeevr) Check if we need to make this a singleton for // compatibility with the old testing code // If there are any loose parameters, we expect each one to generate a @@ -686,8 +686,8 @@ bool BrowserInit::ProcessCmdLineImpl(const CommandLine& command_line, bool silent_launch = false; if (command_line.HasSwitch(switches::kAutomationClientChannelID)) { - std::wstring automation_channel_id = - command_line.GetSwitchValue(switches::kAutomationClientChannelID); + std::string automation_channel_id = WideToASCII( + command_line.GetSwitchValue(switches::kAutomationClientChannelID)); // If there are any loose parameters, we expect each one to generate a // new tab; if there are none then we have no tabs size_t expected_tabs = @@ -728,7 +728,7 @@ bool BrowserInit::ProcessCmdLineImpl(const CommandLine& command_line, } template <class AutomationProviderClass> -void BrowserInit::CreateAutomationProvider(const std::wstring& channel_id, +void BrowserInit::CreateAutomationProvider(const std::string& channel_id, Profile* profile, size_t expected_tabs) { scoped_refptr<AutomationProviderClass> automation = |