Make GTK and Aura parts orthogonal to OS parts

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 6ac134048e5c31c26ada9edd9a81b48b2e98e931..afcf92687a5dfb54462ec6bc985b86dd6d27de7f 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -71,7 +71,7 @@ static base::LazyInstance<MessageLoopObserver> g_message_loop_observer(
 
 ChromeBrowserMainPartsChromeos::ChromeBrowserMainPartsChromeos(
     const MainFunctionParams& parameters)
-    : ChromeBrowserMainPartsBase(parameters) {
+    : ChromeBrowserMainPartsLinux(parameters) {
 }
 
 ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() {
@@ -99,7 +99,7 @@ ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() {
 }
 
 void ChromeBrowserMainPartsChromeos::PreEarlyInitialization() {
-  ChromeBrowserMainPartsBase::PreEarlyInitialization();
+  ChromeBrowserMainPartsLinux::PreEarlyInitialization();
   if (parsed_command_line().HasSwitch(switches::kGuestSession)) {
     // Disable sync and extensions if we're in "browse without sign-in" mode.
     CommandLine* singleton_command_line = CommandLine::ForCurrentProcess();
@@ -110,7 +110,7 @@ void ChromeBrowserMainPartsChromeos::PreEarlyInitialization() {
 }
 
 void ChromeBrowserMainPartsChromeos::PreMainMessageLoopStart() {
-  ChromeBrowserMainPartsBase::PreMainMessageLoopStart();
+  ChromeBrowserMainPartsLinux::PreMainMessageLoopStart();
   // Initialize CrosLibrary only for the browser, unless running tests
   // (which do their own CrosLibrary setup).
   if (!parameters().ui_task) {
@@ -123,12 +123,13 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopStart() {
       new chromeos::CrosNetworkChangeNotifierFactory());
 }
 
-void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
+int ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
   // FILE thread is created in ChromeBrowserMainParts::PreMainMessageLoopRun().
-  ChromeBrowserMainPartsBase::PreMainMessageLoopRun();
+  ChromeBrowserMainPartsLinux::PreMainMessageLoopRun();
   // Get the statistics provider instance here to start loading statistcs
   // on the background FILE thread.
   chromeos::system::StatisticsProvider::GetInstance();
+  return content::RESULT_CODE_NORMAL_EXIT;
 }
 
 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {