Reverting 27389.

base/message_pump_glib_unittest.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 "base/message_pump_glib.h"
 
 #include <gtk/gtk.h>
 #include <math.h>
 
 #include <algorithm>
@@ skipping 167 matching lines @@
   EventInjector* injector_;
   DISALLOW_COPY_AND_ASSIGN(MessagePumpGLibTest);
 };
 
 }  // namespace
 
 // EventInjector is expected to always live longer than the runnable methods.
 // This lets us call NewRunnableMethod on EventInjector instances.
 template<>
 struct RunnableMethodTraits<EventInjector> {
-  static void RetainCallee(EventInjector* obj) { }
-  static void ReleaseCallee(EventInjector* obj) { }
+  void RetainCallee(EventInjector* obj) { }
+  void ReleaseCallee(EventInjector* obj) { }
 };
 
 TEST_F(MessagePumpGLibTest, TestQuit) {
   // Checks that Quit works and that the basic infrastructure is working.
 
   // Quit from a task
   loop()->PostTask(FROM_HERE, NewQuitTask());
   loop()->Run();
   EXPECT_EQ(0, injector()->processed_events());
 
@@ skipping 334 matching lines @@
 
 TEST_F(MessagePumpGLibTest, TestGtkLoop) {
   // Tests that events and posted tasks are correctly exectuted if the message
   // loop is not run by MessageLoop::Run() but by a straight Gtk loop.
   // Note that in this case we don't make strong guarantees about niceness
   // between events and posted tasks.
   loop()->PostTask(FROM_HERE,
                    NewRunnableFunction(TestGtkLoopInternal, injector()));
   loop()->Run();
 }