diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 15:42:59 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 15:42:59 +0000 |
| commit | 17d4e92ef7e8dcb44c82d5f5d60bafc9d87213cf (patch) | |
| tree | 57e9a4e79b946f350878aa81e2576acb728fc260 /chrome_frame/chrome_frame_automation.cc | |
| parent | 0077f4a99f292b46415d41c8b760add2b80712e1 (diff) | |
| download | chromium_src-17d4e92ef7e8dcb44c82d5f5d60bafc9d87213cf.zip chromium_src-17d4e92ef7e8dcb44c82d5f5d60bafc9d87213cf.tar.gz chromium_src-17d4e92ef7e8dcb44c82d5f5d60bafc9d87213cf.tar.bz2 | |
Revert of a revert of a patch that re-enabled automation protocol version mismatch checking in CF.
Original revision: r63211
Revert revision: r63239
Previously, our version information wasn't getting updated properly through incremental builds which made the test builders unhappy. That was fixed in r63355. This should now be safe to commit.
Review URL: http://codereview.chromium.org/4034004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63364 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_automation.cc')
| -rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 7ee5950..28362e5 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -265,6 +265,10 @@ void AutomationProxyCacheEntry::CreateProxy(ChromeFrameLaunchParams* params, ChromeFrameAutomationProxyImpl* proxy = new ChromeFrameAutomationProxyImpl(this, params->launch_timeout()); + // Ensure that the automation proxy actually respects our choice on whether + // or not to check the version. + proxy->set_perform_version_check(params->version_check()); + // Launch browser scoped_ptr<CommandLine> command_line( chrome_launcher::CreateLaunchCommandLine()); |