Reverting 27379.

chrome_frame/test/chrome_frame_unittests.cc

Index: chrome_frame/test/chrome_frame_unittests.cc
===================================================================
--- chrome_frame/test/chrome_frame_unittests.cc	(revision 27386)
+++ chrome_frame/test/chrome_frame_unittests.cc	(working copy)
@@ -34,7 +34,7 @@
 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::kBeforeNavigate2Info = {
+_ATL_FUNC_INFO WebBrowserEventSink::kBeforeNavigate2Info = {
   CC_STDCALL, VT_EMPTY, 7, {
     VT_DISPATCH,
     VT_VARIANT | VT_BYREF,
@@ -797,7 +797,7 @@
   public:
     ~ChromeFrameTestEnvironment() {
     }
-
+    
     void SetUp() {
       ScopedChromeFrameRegistrar::RegisterDefaults();
     }
@@ -806,7 +806,7 @@
     }
 };
 
-::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 @@
 };
 
 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 @@
 };
 
 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
Property changes on: chrome_frame\test\chrome_frame_unittests.cc
___________________________________________________________________
Deleted: svn:eol-style
   - LF