Make use of the new version flag in Chrome to load the correct chrome.dll ver...

chrome_frame/chrome_frame_automation.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome_frame/chrome_frame_automation.h"
 
 #include "app/app_switches.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 27 matching lines @@
 
 int kDefaultSendUMADataInterval = 20000;  // in milliseconds.
 
 static const wchar_t kUmaSendIntervalValue[] = L"UmaSendInterval";
 
 // This lock ensures that histograms created by ChromeFrame are thread safe.
 // The histograms created in ChromeFrame can be initialized on multiple
 // threads.
 Lock g_ChromeFrameHistogramLock;
 
+namespace {
+std::wstring GetCurrentModuleVersion() {
+  scoped_ptr<FileVersionInfo> module_version_info(
+      FileVersionInfo::CreateFileVersionInfoForCurrentModule());
+  DCHECK(module_version_info.get() != NULL);
+  return module_version_info->file_version();
+}
+}
+
 class ChromeFrameAutomationProxyImpl::TabProxyNotificationMessageFilter
     : public IPC::ChannelProxy::MessageFilter {
  public:
   explicit TabProxyNotificationMessageFilter(AutomationHandleTracker* tracker)
       : tracker_(tracker) {
   }
 
   void AddTabProxy(AutomationHandle tab_proxy) {
     AutoLock lock(lock_);
     tabs_list_.push_back(tab_proxy);
@@ skipping 240 matching lines @@
 
   // In accessible mode automation tests expect renderer accessibility to be
   // enabled in chrome.
   if (IsAccessibleMode())
     command_line->AppendSwitch(switches::kForceRendererAccessibility);
 
   DVLOG(1) << "Profile path: " << params->profile_path().value();
   command_line->AppendSwitchPath(switches::kUserDataDir,
                                  params->profile_path());
 
+  // Ensure that Chrome is running the specified version of chrome.dll.
+  command_line->AppendSwitchNative(switches::kChromeVersion,
+                                   GetCurrentModuleVersion());
+
   if (!params->language().empty())
     command_line->AppendSwitchNative(switches::kLang, params->language());
 
   std::wstring command_line_string(command_line->command_line_string());
   // If there are any extra arguments, append them to the command line.
   if (!params->extra_arguments().empty()) {
     command_line_string += L' ' + params->extra_arguments();
   }
 
   automation_server_launch_start_time_ = base::TimeTicks::Now();
@@ skipping 976 matching lines @@
   }
 }
 
 void ChromeFrameAutomationClient::SendContextMenuCommandToChromeFrame(
   int selected_command) {
   DCHECK(tab_ != NULL);
   tab_->SendContextMenuCommand(selected_command);
 }
 
 std::wstring ChromeFrameAutomationClient::GetVersion() const {
-  static FileVersionInfo* version_info =
-      FileVersionInfo::CreateFileVersionInfoForCurrentModule();
-
-  std::wstring version;
-  if (version_info)
-    version = version_info->product_version();
-
-  return version;
+  return GetCurrentModuleVersion();
 }
 
 void ChromeFrameAutomationClient::Print(HDC print_dc,
                                         const RECT& print_bounds) {
   if (!tab_window_) {
     NOTREACHED();
     return;
   }
 
   HDC window_dc = ::GetDC(tab_window_);
@@ skipping 135 matching lines @@
     const URLRequestStatus& status) {
   automation_server_->Send(new AutomationMsg_RequestEnd(0, tab_->handle(),
       request_id, status));
 }
 
 void ChromeFrameAutomationClient::OnCookiesRetrieved(bool success,
     const GURL& url, const std::string& cookie_string, int cookie_id) {
   automation_server_->Send(new AutomationMsg_GetCookiesHostResponse(0,
       tab_->handle(), success, url, cookie_string, cookie_id));
 }