Revert 102005 - aura: Explicitly disable GTK.

base/message_pump_glib_unittest.cc

 // Copyright (c) 2011 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>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/threading/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(TOOLKIT_USES_GTK)
-#include <gtk/gtk.h>
-#endif
-
 namespace {
 
 // This class injects dummy "events" into the GLib loop. When "handled" these
 // events can run tasks. This is intended to mock gtk events (the corresponding
 // GLib source runs at the same priority).
 class EventInjector {
  public:
   EventInjector() : processed_events_(0) {
     source_ = static_cast<Source*>(g_source_new(&SourceFuncs, sizeof(Source)));
     source_->injector = this;
@@ skipping 360 matching lines @@
   loop()->PostTask(
       FROM_HERE, NewRunnableFunction(AddEventsAndDrainGLib, injector()));
   loop()->Run();
 
   EXPECT_EQ(3, injector()->processed_events());
 }
 
 
 namespace {
 
-#if defined(TOOLKIT_USES_GTK)
 void AddEventsAndDrainGtk(EventInjector* injector) {
   // Add a couple of dummy events
   injector->AddEvent(0, NULL);
   injector->AddEvent(0, NULL);
   // Then add an event that will quit the main loop.
   injector->AddEvent(0, NewQuitTask());
 
   // Post a couple of dummy tasks
   MessageLoop::current()->PostTask(FROM_HERE, NewRunnableFunction(DoNothing));
   MessageLoop::current()->PostTask(FROM_HERE, NewRunnableFunction(DoNothing));
 
   // Drain the events
   while (gtk_events_pending()) {
     gtk_main_iteration();
   }
 }
-#endif
 
 }  // namespace
 
-#if defined(TOOLKIT_USES_GTK)
 TEST_F(MessagePumpGLibTest, TestDrainingGtk) {
   // Tests that draining events using Gtk works.
   loop()->PostTask(
       FROM_HERE, NewRunnableFunction(AddEventsAndDrainGtk, injector()));
   loop()->Run();
 
   EXPECT_EQ(3, injector()->processed_events());
 }
-#endif
 
 namespace {
 
 // Helper class that lets us run the GLib message loop.
 class GLibLoopRunner : public base::RefCounted<GLibLoopRunner> {
  public:
   GLibLoopRunner() : quit_(false) { }
 
   void RunGLib() {
     while (!quit_) {
       g_main_context_iteration(NULL, TRUE);
     }
   }
 
-  void RunLoop() {
-#if defined(TOOLKIT_USES_GTK)
+  void RunGtk() {
     while (!quit_) {
       gtk_main_iteration();
     }
-#else
-    while (!quit_) {
-      g_main_context_iteration(NULL, TRUE);
-    }
-#endif
   }
 
   void Quit() {
     quit_ = true;
   }
 
   void Reset() {
     quit_ = false;
   }
 
@@ skipping 53 matching lines @@
   // Delayed events
   injector->AddEvent(10, NULL);
   injector->AddEvent(10, NULL);
   // Delayed work
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE, NewRunnableFunction(IncrementInt, &task_count), 30);
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE, NewRunnableMethod(runner.get(), &GLibLoopRunner::Quit), 40);
 
   // Run a nested, straight Gtk message loop.
-  runner->RunLoop();
+  runner->RunGtk();
 
   ASSERT_EQ(3, task_count);
   EXPECT_EQ(4, injector->processed_events());
   MessageLoop::current()->Quit();
 }
 
 }  // namespace
 
 TEST_F(MessagePumpGLibTest, TestGLibLoop) {
   // Tests that events and posted tasks are correctly exectuted if the message
   // loop is not run by MessageLoop::Run() but by a straight GLib loop.
   // Note that in this case we don't make strong guarantees about niceness
   // between events and posted tasks.
   loop()->PostTask(FROM_HERE,
                    NewRunnableFunction(TestGLibLoopInternal, injector()));
   loop()->Run();
 }
 
 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();
 }