Revert 192504 "Re-apply 192420: Move login switches to src/chromeos"

trunk/src/chrome/browser/chrome_browser_main_linux.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 "chrome/browser/chrome_browser_main_linux.h"
 
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/storage_monitor/storage_monitor_linux.h"
 #include "content/public/browser/browser_thread.h"
 #endif
 
 #if defined(USE_LINUX_BREAKPAD)
 #include <stdlib.h>
 
 #include "base/command_line.h"
 #include "base/linux_util.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/app/breakpad_linux.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/pref_names.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/common/chrome_version_info.h"
-#include "chromeos/chromeos_switches.h"
 #endif
 
 #endif  // defined(USE_LINUX_BREAKPAD)
 
 namespace {
 
 #if defined(USE_LINUX_BREAKPAD)
 #if !defined(OS_CHROMEOS)
 void GetLinuxDistroCallback() {
   base::GetLinuxDistro();  // Initialize base::linux_distro if needed.
@@ skipping 16 matching lines @@
   bool is_chrome_build = true;
 #else
   bool is_chrome_build = false;
 #endif
 
   // Check these settings in Chrome builds only, to reduce the chance
   // that we accidentally upload crash dumps from Chromium builds.
   bool breakpad_enabled = false;
   if (is_chrome_build) {
 #if defined(OS_CHROMEOS)
-    bool is_guest_session = CommandLine::ForCurrentProcess()->HasSwitch(
-        chromeos::switches::kGuestSession);
+    bool is_guest_session =
+        CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession);
     bool is_stable_channel =
         chrome::VersionInfo::GetChannel() ==
         chrome::VersionInfo::CHANNEL_STABLE;
     // TODO(pastarmovj): Consider the TrustedGet here.
     bool reporting_enabled;
     chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
                                               &reporting_enabled);
     breakpad_enabled =
         !(is_guest_session && is_stable_channel) && reporting_enabled;
 #else
@@ skipping 68 matching lines @@
 void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() {
 #if !defined(OS_CHROMEOS)
   // Delete it now. Otherwise the FILE thread would be gone when we try to
   // release it in the dtor and Valgrind would report a leak on almost every
   // single browser_test.
   storage_monitor_.reset();
 #endif
 
   ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
 }