Revert 253994 "[Mac] Remove NSApplication from the renderer."

trunk/src/content/renderer/renderer_main.cc

 // Copyright (c) 2012 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/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/debug/stack_trace.h"
 #include "base/debug/trace_event.h"
 #include "base/i18n/rtl.h"
@@ skipping 27 matching lines @@
 #include "third_party/skia/include/core/SkGraphics.h"
 #endif  // OS_ANDROID
 
 #if defined(OS_MACOSX)
 #include <Carbon/Carbon.h>
 #include <signal.h>
 #include <unistd.h>
 
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
-#include "base/message_loop/message_pump_mac.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #endif  // OS_MACOSX
 
 #if defined(ENABLE_WEBRTC)
 #include "third_party/libjingle/overrides/init_webrtc.h"
 #endif
 
 namespace content {
 namespace {
 // This function provides some ways to test crash and assertion handling
@@ skipping 93 matching lines @@
   HandleRendererErrorTestParameters(parsed_command_line);
 
   RendererMainPlatformDelegate platform(parameters);
 
 
   base::StatsCounterTimer stats_counter_timer("Content.RendererInit");
   base::StatsScope<base::StatsCounterTimer> startup_timer(stats_counter_timer);
 
   RendererMessageLoopObserver task_observer;
 #if defined(OS_MACOSX)
-  // As long as scrollbars on Mac are painted with Cocoa, the message pump
-  // needs to be backed by a Foundation-level loop to process NSTimers. See
-  // http://crbug.com/306348#c24 for details.
-  scoped_ptr<base::MessagePump> pump(new base::MessagePumpNSRunLoop());
-  base::MessageLoop main_message_loop(pump.Pass());
+  // As long as we use Cocoa in the renderer (for the forseeable future as of
+  // now; see http://crbug.com/306348 for info) we need to have a UI loop.
+  base::MessageLoopForUI main_message_loop;
 #else
   // The main message loop of the renderer services doesn't have IO or UI tasks.
   base::MessageLoop main_message_loop;
 #endif
   main_message_loop.AddTaskObserver(&task_observer);
 
   scoped_ptr<MemoryObserver> memory_observer;
   if (parsed_command_line.HasSwitch(switches::kMemoryMetrics)) {
     memory_observer.reset(new MemoryObserver());
     main_message_loop.AddTaskObserver(memory_observer.get());
@@ skipping 75 matching lines @@
       base::MessageLoop::current()->Run();
       TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0);
     }
   }
   platform.PlatformUninitialize();
   TRACE_EVENT_END_ETW("RendererMain", 0, "");
   return 0;
 }
 
 }  // namespace content