Move Mus into chrome's process when running with --mus.

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 <memory>
 
 #include "base/files/file_path.h"
@@ skipping 262 matching lines @@
   // Members initialized in |CreateThreads()| ----------------------------------
   // Note: some |*_thread_| members below may never be initialized when
   // redirection to TaskScheduler is enabled. (ref.
   // ContentBrowserClient::RedirectNonUINonIOBrowserThreadsToTaskScheduler()).
   std::unique_ptr<BrowserProcessSubThread> db_thread_;
   std::unique_ptr<BrowserProcessSubThread> file_user_blocking_thread_;
   std::unique_ptr<BrowserProcessSubThread> file_thread_;
   std::unique_ptr<BrowserProcessSubThread> process_launcher_thread_;
   std::unique_ptr<BrowserProcessSubThread> cache_thread_;
   std::unique_ptr<BrowserProcessSubThread> io_thread_;
+  std::unique_ptr<BrowserProcessSubThread> window_server_thread_;
 
   // Members initialized in |BrowserThreadsStarted()| --------------------------
   std::unique_ptr<base::Thread> indexed_db_thread_;
   std::unique_ptr<ServiceManagerContext> service_manager_context_;
   std::unique_ptr<mojo::edk::ScopedIPCSupport> mojo_ipc_support_;
 
   // |user_input_monitor_| has to outlive |audio_manager_|, so declared first.
   std::unique_ptr<media::UserInputMonitor> user_input_monitor_;
   std::unique_ptr<media::AudioManager> audio_manager_;
   // Calls to |audio_system_| must not be posted to the audio thread if it
@@ skipping 26 matching lines @@
       memory_instrumentation_coordinator_;
 
   // DO NOT add members here. Add them to the right categories above.
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_