diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 14:37:06 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 14:37:06 +0000 |
| commit | 2aec43172688976197ded8e35a485c7351ff30ed (patch) | |
| tree | bdbe27614b284d8875605cfab94679dc23aa4b06 | |
| parent | 38421d697fbe858c26091ddf166933202009cf99 (diff) | |
| download | chromium_src-2aec43172688976197ded8e35a485c7351ff30ed.zip chromium_src-2aec43172688976197ded8e35a485c7351ff30ed.tar.gz chromium_src-2aec43172688976197ded8e35a485c7351ff30ed.tar.bz2 | |
Re-add the version mismatch checking which was removed at some point. Also add version information to chrome_frame_tests.exe. This will be needed for subsequent tests.
Review URL: http://codereview.chromium.org/3879001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63211 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 2 | ||||
| -rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 6ac0b37..cde3108 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -224,6 +224,7 @@ 'dependencies': [ '../base/base.gyp:test_support_base', '../build/temp_gyp/googleurl.gyp:googleurl', + '../chrome/chrome.gyp:chrome_version_header', '../chrome/chrome.gyp:common', '../chrome/chrome.gyp:utility', '../chrome/chrome.gyp:browser', @@ -278,6 +279,7 @@ 'test/url_request_test.cc', 'test/win_event_receiver.cc', 'test/win_event_receiver.h', + 'chrome_launcher_version.rc', 'chrome_tab.h', 'chrome_tab.idl', 'test_utils.cc', 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()); |