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

ui/aura/env.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 "ui/aura/env.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_local.h"
@@ skipping 43 matching lines @@
 #if defined(USE_OZONE)
   ui::OzonePlatform::Shutdown();
 #endif
 
   DCHECK_EQ(this, lazy_tls_ptr.Pointer()->Get());
   lazy_tls_ptr.Pointer()->Set(NULL);
 }
 
 // static
 std::unique_ptr<Env> Env::CreateInstance(Mode mode) {
+  LOG(ERROR) << "Env::CreateInstance";
   DCHECK(!lazy_tls_ptr.Pointer()->Get());
   std::unique_ptr<Env> env(new Env(mode));
   env->Init();
   return env;
 }
 
 // static
 Env* Env::GetInstance() {
   Env* env = lazy_tls_ptr.Pointer()->Get();
-  DCHECK(env) << "Env::CreateInstance must be called before getting the "
-                 "instance of Env.";
+//  DCHECK(env) << "~~Env::CreateInstance must be called before getting the "
+//                 "instance of Env.";
+  if (!env) {
+    LOG(ERROR) << "~~Env::CreateInstance must be called before getting the "
+                   "instance of Env.";
+    base::debug::StackTrace().Print();
+  }
   return env;
 }
 
 // static
 Env* Env::GetInstanceDontCreate() {
   return lazy_tls_ptr.Pointer()->Get();
 }
 
 std::unique_ptr<WindowPort> Env::CreateWindowPort(Window* window) {
   if (mode_ == Mode::LOCAL)
@@ skipping 145 matching lines @@
 ui::EventTargeter* Env::GetEventTargeter() {
   NOTREACHED();
   return NULL;
 }
 
 std::unique_ptr<ui::OSExchangeData::Provider> Env::BuildProvider() {
   return base::MakeUnique<aura::OSExchangeDataProviderMus>();
 }
 
 }  // namespace aura