Revert 192420 "Move login switches to src/chromeos"

It seems to break compile on Google Chrome ChromeOS:

http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20ChromeOS/builds/51573/steps/compile/logs/stdio

chrome/browser/ui/webui/options/browser_options_handler.cc: In member function 'void options::BrowserOptionsHandler::SetupMetricsReportingSettingVisibility()':
chrome/browser/ui/webui/options/browser_options_handler.cc:1422: error: 'kGuestSession' is not a member of 'switches'


> Move login switches to src/chromeos
> 
> We will need access to these switches in src/chromeos as we migrate
> login code there.
> 
> BUG=226495
> 
> Review URL: https://codereview.chromium.org/13532012

TBR=stevenjb@chromium.org
Review URL: https://codereview.chromium.org/13671003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192431 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 4 insertions, 12 deletions

diff --git a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc
index 066a583..fac1fbf 100644
--- a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
index 455f190..86e5ce1 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -60,10 +60,6 @@
 #include "ui/webui/jstemplate_builder.h"
 #include "ui/webui/web_ui_util.h"
 
-#if defined(OS_CHROMEOS)
-#include "chromeos/chromeos_switches.h"
-#endif
-
 #if defined(OS_MACOSX)
 #include "chrome/browser/platform_util.h"
 #endif
@@ -283,8 +279,7 @@ void NTPResourceCache::CreateNewTabIncognitoHTML() {
   const char* new_tab_link = kLearnMoreIncognitoUrl;
   // TODO(altimofeev): consider implementation without 'if def' usage.
 #if defined(OS_CHROMEOS)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          chromeos::switches::kGuestSession)) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) {
     new_tab_message_ids = IDS_NEW_TAB_GUEST_SESSION_MESSAGE;
     new_tab_html_idr = IDR_GUEST_SESSION_TAB_HTML;
     new_tab_link = kLearnMoreGuestSessionUrl;
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index af5055c..dabe85a 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -89,7 +89,6 @@
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h"
 #include "chrome/browser/ui/webui/options/advanced_options_utils.h"
-#include "chromeos/chromeos_switches.h"
 #endif
 
 #if defined(OS_CHROMEOS)
diff --git a/chrome/browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest.cc
index 5256c8d..13c34c6 100644
--- a/chrome/browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest.cc
@@ -5,7 +5,6 @@
 #include "base/command_line.h"
 #include "chrome/browser/ui/webui/options/options_ui_browsertest.h"
 #include "chrome/common/chrome_switches.h"
-#include "chromeos/chromeos_switches.h"
 
 namespace {
 
@@ -13,10 +12,10 @@ namespace {
 // switches.
 class GuestModeOptionsBrowserTest : public options::OptionsBrowserTest {
  public:
-  GuestModeOptionsBrowserTest() : OptionsBrowserTest() {}
+   GuestModeOptionsBrowserTest() : OptionsBrowserTest() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    command_line->AppendSwitch(chromeos::switches::kGuestSession);
+   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    command_line->AppendSwitch(switches::kGuestSession);
     command_line->AppendSwitch(switches::kIncognito);
   }
 };