Re-land 16025005 with fix for statics perf issue

content/browser/browser_main_loop.h

 // 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.
 
 #ifndef CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/browser_process_sub_thread.h"
 
 class CommandLine;
 class HighResolutionTimerManager;
 
 namespace base {
 class MessageLoop;
 class PowerMonitor;
 class SystemMonitor;
 }
 
 namespace media {
 class AudioManager;
+class MIDIManager;
 }
 
 namespace net {
 class NetworkChangeNotifier;
 }
 
 namespace content {
 class AudioMirroringManager;
 class BrowserMainParts;
 class BrowserOnlineStateObserver;
@@ skipping 41 matching lines @@
 
   int GetResultCode() const { return result_code_; }
 
   media::AudioManager* audio_manager() const { return audio_manager_.get(); }
   AudioMirroringManager* audio_mirroring_manager() const {
     return audio_mirroring_manager_.get();
   }
   MediaStreamManager* media_stream_manager() const {
     return media_stream_manager_.get();
   }
+  media::MIDIManager* midi_manager() const { return midi_manager_.get(); }
 
  private:
   class MemoryObserver;
   // For ShutdownThreadsAndCleanUp.
   friend class BrowserShutdownImpl;
 
   void InitializeMainThread();
 
   // Called right after the browser threads have been started.
   void BrowserThreadsStarted();
 
   void MainMessageLoopRun();
 
   // Members initialized on construction ---------------------------------------
   const MainFunctionParams& parameters_;
   const CommandLine& parsed_command_line_;
   int result_code_;
 
   // Members initialized in |MainMessageLoopStart()| ---------------------------
   scoped_ptr<base::MessageLoop> main_message_loop_;
   scoped_ptr<base::SystemMonitor> system_monitor_;
   scoped_ptr<base::PowerMonitor> power_monitor_;
   scoped_ptr<HighResolutionTimerManager> hi_res_timer_manager_;
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
   scoped_ptr<media::AudioManager> audio_manager_;
+  scoped_ptr<media::MIDIManager> midi_manager_;
   scoped_ptr<AudioMirroringManager> audio_mirroring_manager_;
   scoped_ptr<MediaStreamManager> media_stream_manager_;
   // Per-process listener for online state changes.
   scoped_ptr<BrowserOnlineStateObserver> online_state_observer_;
 #if defined(OS_WIN)
   scoped_ptr<SystemMessageWindowWin> system_message_window_;
 #elif defined(OS_LINUX)
   scoped_ptr<DeviceMonitorLinux> device_monitor_linux_;
 #elif defined(OS_MACOSX) && !defined(OS_IOS)
   scoped_ptr<DeviceMonitorMac> device_monitor_mac_;
@@ skipping 22 matching lines @@
   scoped_ptr<BrowserProcessSubThread> cache_thread_;
   scoped_ptr<BrowserProcessSubThread> io_thread_;
   scoped_ptr<MemoryObserver> memory_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_