Reverting 27379.

chrome_frame/chrome_frame_automation.cc

 // Copyright (c) 2009 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 "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
@@ skipping 126 matching lines @@
 
 
 ProxyFactory::ProxyCacheEntry::ProxyCacheEntry(const std::wstring& profile)
     : proxy(NULL), profile_name(profile), ref_count(1),
     launch_result(AutomationLaunchResult(-1)) {
   thread.reset(new base::Thread(WideToASCII(profile_name).c_str()));
   thread->Start();
 }
 
 template <> struct RunnableMethodTraits<ProxyFactory> {
-  void RetainCallee(ProxyFactory* obj) {}
-  void ReleaseCallee(ProxyFactory* obj) {}
+  static void RetainCallee(ProxyFactory* obj) {}
+  static void ReleaseCallee(ProxyFactory* obj) {}
 };
 
 ProxyFactory::ProxyFactory()
     : uma_send_interval_(0) {
   uma_send_interval_ = GetConfigInt(kDefaultSendUMADataInterval,
                                     kUmaSendIntervalValue);
 }
 
 ProxyFactory::~ProxyFactory() {
   DCHECK_EQ(proxies_.container().size(), 0);
@@ skipping 810 matching lines @@
   return true;
 }
 
 void ChromeFrameAutomationClient::AttachExternalTab(
     intptr_t external_tab_cookie) {
   DCHECK(tab_.get() == NULL);
   DCHECK(tab_handle_ == -1);
 
   external_tab_cookie_ = external_tab_cookie;
 }