Converts chrome to aura-mus

chrome/app/chrome_main.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 <stdint.h>
 
 #include "build/build_config.h"
 #include "base/command_line.h"
 #include "base/time/time.h"
 #include "chrome/app/chrome_main_delegate.h"
 #include "chrome/common/features.h"
 #include "content/public/app/content_main.h"
 #include "content/public/common/content_switches.h"
 #include "headless/public/headless_shell.h"
 #include "ui/gfx/switches.h"
 
 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
 #include "chrome/app/mash/mash_runner.h"
 #include "chrome/common/channel_info.h"
 #include "components/version_info/version_info.h"
+#include "services/service_manager/runner/common/client_util.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/debug/dump_without_crashing.h"
 #include "base/win/win_util.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/install_static/install_details.h"
 
 #define DLLEXPORT __declspec(dllexport)
 
@@ skipping 65 matching lines @@
     return headless::HeadlessShellMain(argc, argv);
 #endif  // defined(OS_LINUX)
 
 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
   version_info::Channel channel = chrome::GetChannel();
   if (channel == version_info::Channel::CANARY ||
       channel == version_info::Channel::UNKNOWN) {
     if (command_line->HasSwitch("mash"))
       return MashMain();
     WaitForMashDebuggerIfNecessary();
+    if (service_manager::ServiceManagerIsRemote())
+      params.env_mode = aura::Env::Mode::MUS;

[Peng, 2017/01/03 20:15:38]

This change breaks exo in mus. The exo crashes at [1]. Sky, do you have any idea
how to fix it?


[1]
https://cs.chromium.org/chromium/src/components/exo/shell_surface.cc?rcl=0&l=838

[24848:24848:0103/151250.080451:FATAL:wm_window_aura.cc(104)] Check failed:
aura::Env::Mode::LOCAL == aura::Env::GetInstance()->mode() (0 vs. 1)
#0 0x2b02254b1bde base::debug::StackTrace::StackTrace()
#1 0x2b02254d25ba logging::LogMessage::~LogMessage()
#2 0x2b022af09a1e ash::WmWindowAura::Get()
#3 0x2b022b0518af ash::wm::GetWindowState()
#4 0x2b02222061a8 exo::ShellSurface::CreateNonClientFrameView()
#5 0x2b02222062ea exo::ShellSurface::CreateNonClientFrameView()
#6 0x2b02297e7dea views::Widget::CreateNonClientFrameView()
#7 0x2b02297e5c3c views::Widget::Init()
#8 0x2b022220324c exo::ShellSurface::CreateShellSurfaceWidget()
#9 0x2b0222205828 exo::ShellSurface::OnSurfaceCommit()
#10 0x2b022220aeb1 exo::Surface::Commit()
#11 0x2b022d90dadc ffi_call_unix64
#12 0x2b022d90d40c ffi_call
#13 0x2b02239a2477 wl_closure_invoke
#14 0x2b02239a0280 wl_client_connection_data
#15 0x2b022399f982 wl_event_loop_dispatch
#16 0x2b02222fc64d exo::wayland::Server::Dispatch()
#17 0x2b022264676f
ChromeBrowserMainExtraPartsExo::WaylandWatcher::OnFileCanReadWithoutBlocking()
#18 0x2b02254e2041 base::MessagePumpLibevent::OnLibeventNotification()
#19 0x2b0225596627 event_base_loop
#20 0x2b02254e2306 base::MessagePumpLibevent::Run()
#21 0x2b02254df2ab base::MessageLoop::RunHandler()
#22 0x2b022550ef5f base::RunLoop::Run()
#23 0x2b0222445dd3 ChromeBrowserMainParts::MainMessageLoopRun()
#24 0x2b0227393b43 content::BrowserMainLoop::RunMainMessageLoopParts()
#25 0x2b02273968aa content::BrowserMainRunnerImpl::Run()
#26 0x2b022738ee78 content::BrowserMain()
#27 0x2b0227ae9ffc content::ContentMainRunnerImpl::Run()
#28 0x2b0227ae8b30 content::ContentMain()
#29 0x2b0221b971e0 ChromeMain
#30 0x2b022e0e5f45 __libc_start_main
#31 0x2b0221b9701d <unknown>

[sadrul, 2017/01/03 20:19:31]

Looks like exo is trying to use ash? We need to make sure that does not happen.
(since ash is in a separate process)

How did it work before this change?

   }
 #endif  // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
 
   int rv = content::ContentMain(params);
 
 #if defined(OS_WIN)
   base::win::SetShouldCrashOnProcessDetach(false);
 #endif
 
   return rv;
 }