Adds ability to specify how aura::Env is created in content

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 1559 matching lines @@
 
 #if defined(USE_X11)
   if (!gfx::GetXDisplay()) {
     LOG(ERROR) << "Unable to open X display.";
     return false;
   }
 #endif
 
   // Env creates the compositor. Aura widgets need the compositor to be created
   // before they can be initialized by the browser.
-  env_ = aura::Env::CreateInstance();
+  env_ = aura::Env::CreateInstance(parameters_.env_mode);
 #endif  // defined(USE_AURA)
 
   if (parts_)
     parts_->ToolkitInitialized();
 
   return true;
 }
 
 void BrowserMainLoop::MainMessageLoopRun() {
 #if defined(OS_ANDROID)
@@ skipping 110 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