3 files changed, 19 insertions, 16 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index 1f369b5..79c0c38 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -144,8 +144,8 @@ ProxyFactory::ProxyCacheEntry::ProxyCacheEntry(const std::wstring& profile)
 }
 
 template <> struct RunnableMethodTraits<ProxyFactory> {
-  void RetainCallee(ProxyFactory* obj) {}
-  void ReleaseCallee(ProxyFactory* obj) {}
+  static void RetainCallee(ProxyFactory* obj) {}
+  static void ReleaseCallee(ProxyFactory* obj) {}
 };
 
 ProxyFactory::ProxyFactory()
diff --git a/chrome_frame/chrome_frame_delegate.h b/chrome_frame/chrome_frame_delegate.h
index ebde626..a3302da 100644
--- a/chrome_frame/chrome_frame_delegate.h
+++ b/chrome_frame/chrome_frame_delegate.h
@@ -37,8 +37,11 @@ class ChromeFrameDelegate {
 
 // Template specialization
 template <> struct RunnableMethodTraits<ChromeFrameDelegate> {
-  void RetainCallee(ChromeFrameDelegate* obj) {}
-  void ReleaseCallee(ChromeFrameDelegate* obj) {}
+  static void RetainCallee(ChromeFrameDelegate* obj) {
+  }
+
+  static void ReleaseCallee(ChromeFrameDelegate* obj) {
+  }
 };
 
 extern UINT kAutomationServerReady;
diff --git a/chrome_frame/test/chrome_frame_unittests.cc b/chrome_frame/test/chrome_frame_unittests.cc
index d24f5b3..20826b1 100644
--- a/chrome_frame/test/chrome_frame_unittests.cc
+++ b/chrome_frame/test/chrome_frame_unittests.cc
@@ -34,7 +34,7 @@ const wchar_t kDocRoot[] = L"chrome_frame\\test\\data";
 const int kLongWaitTimeout = 60 * 1000;
 const int kShortWaitTimeout = 25 * 1000;
 
-_ATL_FUNC_INFO WebBrowserEventSink::kNavigateErrorInfo = {
+_ATL_FUNC_INFO WebBrowserEventSink::kNavigateErrorInfo = {
   CC_STDCALL, VT_EMPTY, 5, {
     VT_DISPATCH,
     VT_VARIANT | VT_BYREF,
@@ -51,7 +51,7 @@ _ATL_FUNC_INFO WebBrowserEventSink::kNavigateComplete2Info = {
   }
 };
 
-_ATL_FUNC_INFO WebBrowserEventSink::kBeforeNavigate2Info = {
+_ATL_FUNC_INFO WebBrowserEventSink::kBeforeNavigate2Info = {
   CC_STDCALL, VT_EMPTY, 7, {
     VT_DISPATCH,
     VT_VARIANT | VT_BYREF,
@@ -797,7 +797,7 @@ class ChromeFrameTestEnvironment: public testing::Environment {
   public:
     ~ChromeFrameTestEnvironment() {
     }
-
+    
     void SetUp() {
       ScopedChromeFrameRegistrar::RegisterDefaults();
     }
@@ -806,7 +806,7 @@ class ChromeFrameTestEnvironment: public testing::Environment {
     }
 };
 
-::testing::Environment* const chrome_frame_env =
+::testing::Environment* const chrome_frame_env =
     ::testing::AddGlobalTestEnvironment(new ChromeFrameTestEnvironment);
 
 // TODO(stoyan): - Move everything below in separate file(s).
@@ -988,18 +988,18 @@ struct MockAutomationMessageSender : public AutomationMessageSender {
 };
 
 template <> struct RunnableMethodTraits<ProxyFactory::LaunchDelegate> {
-  void RetainCallee(ProxyFactory::LaunchDelegate* obj) {}
-  void ReleaseCallee(ProxyFactory::LaunchDelegate* obj) {}
+  static void RetainCallee(ProxyFactory::LaunchDelegate* obj) {}
+  static void ReleaseCallee(ProxyFactory::LaunchDelegate* obj) {}
 };
 
 template <> struct RunnableMethodTraits<MockProxyFactory> {
-  void RetainCallee(MockProxyFactory* obj) {}
-  void ReleaseCallee(MockProxyFactory* obj) {}
+  static void RetainCallee(MockProxyFactory* obj) {}
+  static void ReleaseCallee(MockProxyFactory* obj) {}
 };
 
 template <> struct RunnableMethodTraits<ChromeFrameAutomationClient> {
-  void RetainCallee(ChromeFrameAutomationClient* obj) {}
-  void ReleaseCallee(ChromeFrameAutomationClient* obj) {}
+  static void RetainCallee(ChromeFrameAutomationClient* obj) {}
+  static void ReleaseCallee(ChromeFrameAutomationClient* obj) {}
 };
 
 // MessageLoopForUI wrapper that runs only for a limited time.
@@ -1019,8 +1019,8 @@ struct TimedMsgLoop {
 };
 
 template <> struct RunnableMethodTraits<TimedMsgLoop> {
-  void RetainCallee(TimedMsgLoop* obj) {}
-  void ReleaseCallee(TimedMsgLoop* obj) {}
+  static void RetainCallee(TimedMsgLoop* obj) {}
+  static void ReleaseCallee(TimedMsgLoop* obj) {}
 };
 
 // Saves typing. It's somewhat hard to create a wrapper around