Hosting the discardable memory service in the mus process

content/browser/browser_main_loop.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 "content/browser/browser_main_loop.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 615 matching lines @@
   {
     base::SetRecordActionTaskRunner(
         BrowserThread::GetTaskRunnerForThread(BrowserThread::UI));
   }
 
 #if defined(OS_WIN)
   if (base::win::GetVersion() >= base::win::VERSION_WIN8)
     screen_orientation_delegate_.reset(new ScreenOrientationDelegateWin());
 #endif
 
-  auto* discardable_shared_memory_manager =
-      discardable_memory::DiscardableSharedMemoryManager::CreateInstance();
+  // Only use discardable_memory::DiscardableSharedMemoryManager when Chrome is
+  // not running in mus+ash.
+  if (!service_manager::ServiceManagerIsRemote()) {
+    auto* discardable_shared_memory_manager =
+        discardable_memory::DiscardableSharedMemoryManager::CreateInstance();
 
-  // TODO(boliu): kSingleProcess check is a temporary workaround for
-  // in-process Android WebView. crbug.com/503724 tracks proper fix.
-  if (!parsed_command_line_.HasSwitch(switches::kSingleProcess)) {
-    base::DiscardableMemoryAllocator::SetInstance(
-        discardable_shared_memory_manager);
+    // TODO(boliu): kSingleProcess check is a temporary workaround for
+    // in-process Android WebView. crbug.com/503724 tracks proper fix.
+    if (!parsed_command_line_.HasSwitch(switches::kSingleProcess)) {
+      base::DiscardableMemoryAllocator::SetInstance(
+          discardable_shared_memory_manager);
+    }
   }
 
   if (parts_)
     parts_->PostMainMessageLoopStart();
 
   // Start startup tracing through TracingController's interface. TraceLog has
   // been enabled in content_main_runner where threads are not available. Now We
   // need to start tracing for all other tracing agents, which require threads.
   if (parsed_command_line_.HasSwitch(switches::kTraceStartup)) {
     base::trace_event::TraceConfig trace_config(
@@ skipping 955 matching lines @@
   if (!audio_manager_) {
     audio_thread_ = base::MakeUnique<AudioDeviceThread>();
     audio_manager_ = media::AudioManager::Create(
         audio_thread_->GetTaskRunner(), audio_thread_->worker_task_runner(),
         MediaInternals::GetInstance());
   }
   CHECK(audio_manager_);
 }
 
 }  // namespace content