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

trunk/src/chrome/browser/automation/automation_provider.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/automation/automation_provider.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 60 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFindOptions.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "chromeos/chromeos_switches.h"
 #endif  // defined(OS_CHROMEOS)
 
 using WebKit::WebFindOptions;
 using base::Time;
 using content::BrowserThread;
 using content::DownloadItem;
 using content::NavigationController;
 using content::RenderViewHost;
 using content::TraceController;
 using content::WebContents;
@@ skipping 118 matching lines @@
       effective_channel_id,
       GetChannelMode(use_named_interface),
       this,
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
   channel_->AddFilter(automation_resource_message_filter_);
 
 #if defined(OS_CHROMEOS)
   if (use_initial_load_observers_) {
     // Wait for webui login to be ready.
     // Observer will delete itself.
-    if (CommandLine::ForCurrentProcess()->HasSwitch(
-            chromeos::switches::kLoginManager) &&
+    if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kLoginManager) &&
         !chromeos::UserManager::Get()->IsUserLoggedIn()) {
       login_webui_ready_ = false;
       new OOBEWebuiReadyObserver(this);
     }
 
     // Wait for the network manager to initialize.
     // The observer will delete itself when done.
     network_library_initialized_ = false;
     NetworkManagerInitObserver* observer = new NetworkManagerInitObserver(this);
     if (!observer->Init())
@@ skipping 593 matching lines @@
 
   return NULL;
 }
 
 void AutomationProvider::SaveAsAsync(int tab_handle) {
   NavigationController* tab = NULL;
   WebContents* web_contents = GetWebContentsForHandle(tab_handle, &tab);
   if (web_contents)
     web_contents->OnSavePage();
 }