diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-11 11:37:41 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-11 11:37:41 +0000 |
| commit | 713a5f2c310760e24319e91f7f6cfe47f6043d12 (patch) | |
| tree | 0cfd820e8ca8c2400595e808693baeb115f01dff /chrome_frame/chrome_frame_automation.cc | |
| parent | e6c276f8e0094c07cf0805f43f5f345334a9cc4e (diff) | |
| download | chromium_src-713a5f2c310760e24319e91f7f6cfe47f6043d12.zip chromium_src-713a5f2c310760e24319e91f7f6cfe47f6043d12.tar.gz chromium_src-713a5f2c310760e24319e91f7f6cfe47f6043d12.tar.bz2 | |
Revert "Add named testing interface."
http://src.chromium.org/viewvc/chrome?view=rev&revision=67300
The change has been approved conditionally,
i.e. if the outstanding review comments are handled
in a follow-up as the top priority.
Two weeks have passed, and I have not seen the follow-up.
It is risky to keep this change in the tree, as it is already
non-trivial to revert.
Conflicts:
chrome/browser/automation/automation_provider.cc
chrome/test/ui/named_interface_uitest.cc
ipc/ipc_channel_posix.cc
TBR=nirnimesh
BUG=chromium-os:8512
TEST=none
Review URL: http://codereview.chromium.org/5707006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68944 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_automation.cc')
| -rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index b670548..c8a0938 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -144,13 +144,10 @@ class ChromeFrameAutomationProxyImpl::CFMsgDispatcher }; ChromeFrameAutomationProxyImpl::ChromeFrameAutomationProxyImpl( - AutomationProxyCacheEntry* entry, - std::string channel_id, int launch_timeout) + AutomationProxyCacheEntry* entry, int launch_timeout) : AutomationProxy(launch_timeout, false), proxy_entry_(entry) { TRACE_EVENT_BEGIN("chromeframe.automationproxy", this, ""); - InitializeChannel(channel_id, false); - sync_ = new CFMsgDispatcher(); message_filter_ = new TabProxyNotificationMessageFilter(tracker_.get()); @@ -274,10 +271,8 @@ void AutomationProxyCacheEntry::CreateProxy(ChromeFrameLaunchParams* params, // destruction notification. // At same time we must destroy/stop the thread from another thread. - std::string channel_id = AutomationProxy::GenerateChannelID(); ChromeFrameAutomationProxyImpl* proxy = - new ChromeFrameAutomationProxyImpl(this, channel_id, - params->launch_timeout()); + new ChromeFrameAutomationProxyImpl(this, params->launch_timeout()); // Ensure that the automation proxy actually respects our choice on whether // or not to check the version. @@ -287,7 +282,7 @@ void AutomationProxyCacheEntry::CreateProxy(ChromeFrameLaunchParams* params, scoped_ptr<CommandLine> command_line( chrome_launcher::CreateLaunchCommandLine()); command_line->AppendSwitchASCII(switches::kAutomationClientChannelID, - channel_id); + proxy->channel_id()); // Run Chrome in Chrome Frame mode. In practice, this modifies the paths // and registry keys that Chrome looks in via the BrowserDistribution |