Refactor some more BrowserMain code. Move core code that's required by all embedders to content.

chrome/browser/chromeos/browser_main_chromeos.cc

 // Copyright (c) 2010 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 "chrome/browser/chromeos/browser_main_chromeos.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
+#include "chrome/browser/defaults.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/common/main_function_params.h"
 #include "net/base/network_change_notifier.h"
 
 #include <gtk/gtk.h>
 
 class MessageLoopObserver : public MessageLoopForUI::Observer {
   virtual void WillProcessEvent(GdkEvent* event) {
     // On chromeos we want to map Alt-left click to right click.
     // This code only changes presses and releases. We could decide to also
@@ skipping 33 matching lines @@
   if (!parameters().ui_task && chromeos::CrosLibrary::Get())
     chromeos::CrosLibrary::Shutdown();
 
   // To be precise, logout (browser shutdown) is not yet done, but the
   // remaining work is negligible, hence we say LogoutDone here.
   chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
                                                         false);
   chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
 }
 
+void BrowserMainPartsChromeos::PreEarlyInitialization() {
+  BrowserMainPartsGtk::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();
+    singleton_command_line->AppendSwitch(switches::kDisableSync);
+    singleton_command_line->AppendSwitch(switches::kDisableExtensions);
+    browser_defaults::bookmarks_enabled = false;
+  }
+}
+
 void BrowserMainPartsChromeos::PreMainMessageLoopStart() {
+  BrowserMainPartsGtk::PreMainMessageLoopStart();
   // Initialize CrosLibrary only for the browser, unless running tests
   // (which do their own CrosLibrary setup).
   if (!parameters().ui_task) {
     bool use_stub = parameters().command_line_.HasSwitch(switches::kStubCros);
     chromeos::CrosLibrary::Initialize(use_stub);
   }
   // Replace the default NetworkChangeNotifierFactory with ChromeOS specific
   // implementation.
   net::NetworkChangeNotifier::SetFactory(
       new chromeos::CrosNetworkChangeNotifierFactory());
 }
 
 void BrowserMainPartsChromeos::PostMainMessageLoopStart() {
   BrowserMainPartsPosix::PostMainMessageLoopStart();
   MessageLoopForUI* message_loop = MessageLoopForUI::current();
   message_loop->AddObserver(g_message_loop_observer.Pointer());
 }