Initial refactoring complete

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index c6b099ab467d004f5d6b60b47b2131695cc55831..811ed1b9577b81b9d638c6a29669f3f6d49cf4df 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -530,6 +530,9 @@ const char kEnableSync[]                    = "enable-sync";
 // Enable syncing browser autofill.
 const char kEnableSyncAutofill[]            = "enable-sync-autofill";
 
+// Enable Sync to use OAuth instead of ClientLogin
+const char kEnableSyncOAuth[]               = "enable-sync-oauth";
+
 // Enable syncing browser sessions.
 const char kEnableSyncSessions[]            = "enable-sync-sessions";
 
@@ -1188,6 +1191,10 @@ const char kKeepMouseCursor[]               = "keep-mouse-cursor";
 #endif
 
 #ifndef NDEBUG
+// Clear the authentication service before using it.  This allows simulating
+// the expiration of credentials during testing.
+const char kClearAuthenticationService[]    = "clear-authentication-service";
+
 // Clear the token service before using it.  This allows simulating
 // the expiration of credentials during testing.
 const char kClearTokenService[]             = "clear-token-service";