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

chrome/browser/chromeos/login/chrome_restart_request.cc

 // Copyright 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.
 
 #include "chrome/browser/chromeos/login/chrome_restart_request.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "base/chromeos/chromeos_version.h"
@@ skipping 79 matching lines @@
       ::switches::kDisableGestureTapHighlight,
       ::switches::kEnableLogging,
       ::switches::kEnablePinch,
       ::switches::kEnableThreadedCompositing,
       ::switches::kEnableViewport,
       ::switches::kEnableVsyncNotification,
       ::switches::kForceDeviceScaleFactor,
       ::switches::kGpuStartupDialog,
       ::switches::kHasChromeOSDiamondKey,
       ::switches::kHasChromeOSKeyboard,
-      ::switches::kLoginProfile,
       ::switches::kNaturalScrollDefault,
       ::switches::kNoSandbox,
       ::switches::kPpapiFlashArgs,
       ::switches::kPpapiFlashInProcess,
       ::switches::kPpapiFlashPath,
       ::switches::kPpapiFlashVersion,
       ::switches::kPpapiInProcess,
       ::switches::kRendererStartupDialog,
 #if defined(USE_XI2_MT)
       ::switches::kTouchCalibration,
@@ skipping 43 matching lines @@
       cc::switches::kShowPropertyChangedRects,
       cc::switches::kShowReplicaScreenSpaceRects,
       cc::switches::kShowScreenSpaceRects,
       cc::switches::kShowSurfaceDamageRects,
       cc::switches::kSlowDownRasterScaleFactor,
       cc::switches::kTraceAllRenderedFrames,
       cc::switches::kTraceOverdraw,
       cc::switches::kUIEnablePartialSwap,
       cc::switches::kUIEnablePerTilePainting,
       chromeos::switches::kDbusStub,
+      chromeos::switches::kLoginProfile,
       gfx::switches::kEnableBrowserTextSubpixelPositioning,
       gfx::switches::kEnableWebkitTextSubpixelPositioning,
       views::corewm::switches::kNoDropShadows,
       views::corewm::switches::kWindowAnimationsDisabled,
   };
   command_line->CopySwitchesFrom(base_command_line,
                                  kForwardSwitches,
                                  arraysize(kForwardSwitches));
 
   if (start_url.is_valid())
@@ skipping 119 matching lines @@
   delete this;
 }
 
 }  // namespace
 
 std::string GetOffTheRecordCommandLine(
     const GURL& start_url,
     const CommandLine& base_command_line,
     CommandLine* command_line) {
   base::DictionaryValue otr_switches;
-  otr_switches.SetString(::switches::kGuestSession, std::string());
+  otr_switches.SetString(switches::kGuestSession, std::string());
   otr_switches.SetString(::switches::kIncognito, std::string());
   otr_switches.SetString(::switches::kLoggingLevel, kGuestModeLoggingLevel);
-  otr_switches.SetString(::switches::kLoginUser, kGuestUserName);
+  otr_switches.SetString(switches::kLoginUser, kGuestUserName);
 
   // Override the home page.
   otr_switches.SetString(::switches::kHomePage,
                          GURL(chrome::kChromeUINewTabURL).spec());
 
   return DeriveCommandLine(start_url,
                            base_command_line,
                            otr_switches,
                            command_line);
 }
@@ skipping 11 matching lines @@
     // Relaunch chrome without session manager on dev box.
     ReLaunch(command_line);
     return;
   }
 
   // ChromeRestartRequest deletes itself after request sent to session manager.
   (new ChromeRestartRequest(command_line))->Start();
 }
 
 }  // namespace chromeos