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

trunk/src/chrome/browser/chromeos/extensions/file_manager_browsertest.cc

 // Copyright (c) 2013 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.
 
 // Browser test for basic Chrome OS file manager functionality:
 //  - The file list is updated when a file is added externally to the Downloads
 //    folder.
 //  - Selecting a file and copy-pasting it with the keyboard copies the file.
 //  - Selecting a file and pressing delete deletes it.
 
@@ skipping 11 matching lines @@
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "chromeos/chromeos_switches.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/render_view_host.h"
 #include "net/base/escape.h"
 #include "webkit/fileapi/external_mount_points.h"
 
 namespace {
 
 const char kFileManagerExtensionId[] = "hhaomjibdihmijegdhdafkllkbggdgoj";
 
 const char kKeyboardTestFileName[] = "world.mpeg";
@@ skipping 60 matching lines @@
     // Files starting with . are filtered out in
     // file_manager/js/directory_contents.js, so this should not be shown.
     CreateTestDirectory(".warez", "26 Oct 1985 13:39");
 
     ExtensionApiTest::SetUp();
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     bool in_guest_mode = GetParam();
     if (in_guest_mode) {
-      command_line->AppendSwitch(chromeos::switches::kGuestSession);
+      command_line->AppendSwitch(switches::kGuestSession);
       command_line->AppendSwitch(switches::kIncognito);
     }
     ExtensionApiTest::SetUpCommandLine(command_line);
   }
 
  protected:
   // Creates a file with the given |name|, |length|, and |modification_time|.
   void CreateTestFile(const std::string& name,
                       int length,
                       const std::string& modification_time);
@@ skipping 223 matching lines @@
   watcher.StartAndWaitUntilReady();
 
   ResultCatcher catcher;
   StartTest("keyboard delete");
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   ASSERT_TRUE(watcher.RunMessageLoopUntilConditionSatisfied());
 }
 
 }  // namespace