diff options
| author | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 20:40:16 +0000 |
|---|---|---|
| committer | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 20:40:16 +0000 |
| commit | dfe0debf4898226ea62f05f66bce50962ce86f66 (patch) | |
| tree | b50a11a1793ee6308f5fe08a5eb21c37350f225e /chrome_frame/chrome_frame_automation.cc | |
| parent | 70ff5a3da878193664101a156a8cca35a87a40d4 (diff) | |
| download | chromium_src-dfe0debf4898226ea62f05f66bce50962ce86f66.zip chromium_src-dfe0debf4898226ea62f05f66bce50962ce86f66.tar.gz chromium_src-dfe0debf4898226ea62f05f66bce50962ce86f66.tar.bz2 | |
Revert 68944 - Revert "Add named testing interface."
Reverting the revert of named interface CL. Followup CL which addresses Pawel's comments is up at
http://codereview.chromium.org/5967003/
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
TBR=phajdan.jr@chromium.org
BUG=chromium-os:8512
TEST=ui_tests --gtest_filter=NamedInterfaceTest.FLAKY_BasicNamedInterface
Review URL: http://codereview.chromium.org/6012006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70089 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, 8 insertions, 3 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 8fb4d48..e0d8ead 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -136,10 +136,13 @@ class ChromeFrameAutomationProxyImpl::CFMsgDispatcher }; ChromeFrameAutomationProxyImpl::ChromeFrameAutomationProxyImpl( - AutomationProxyCacheEntry* entry, int launch_timeout) + AutomationProxyCacheEntry* entry, + std::string channel_id, 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()); @@ -263,8 +266,10 @@ 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, params->launch_timeout()); + new ChromeFrameAutomationProxyImpl(this, channel_id, + params->launch_timeout()); // Ensure that the automation proxy actually respects our choice on whether // or not to check the version. @@ -274,7 +279,7 @@ void AutomationProxyCacheEntry::CreateProxy(ChromeFrameLaunchParams* params, scoped_ptr<CommandLine> command_line( chrome_launcher::CreateLaunchCommandLine()); command_line->AppendSwitchASCII(switches::kAutomationClientChannelID, - proxy->channel_id()); + channel_id); // Run Chrome in Chrome Frame mode. In practice, this modifies the paths // and registry keys that Chrome looks in via the BrowserDistribution |