Initial refactoring complete

chrome/browser/profiles/profile.h

Index: chrome/browser/profiles/profile.h
diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile.h
index e7d17413022b3c83a04b35134a4f354de5dfa16f..aa89e941013ce8c08f49fe2f70ccddf25d54a43b 100644
--- a/chrome/browser/profiles/profile.h
+++ b/chrome/browser/profiles/profile.h
@@ -41,6 +41,7 @@ namespace webkit_database {
 class DatabaseTracker;
 }
 
+class AuthenticationService;
 class AutocompleteClassifier;
 class BackgroundContentsService;
 class BookmarkModel;
@@ -410,8 +411,13 @@ class Profile {
   virtual ProtocolHandlerRegistry* GetProtocolHandlerRegistry() = 0;
 
   // Returns the Gaia Token Service, creating if not yet created.
+  // New use-cases should begin with GetAuthenticationService().
   virtual TokenService* GetTokenService() = 0;
 
+  // Returns the default Authentication Service, creating if not yet created.
+  // Intended to replace GetTokenService()
+  virtual AuthenticationService* GetAuthenticationService() = 0;
+
   // Returns the ProfileSyncService, creating if not yet created.
   virtual ProfileSyncService* GetProfileSyncService() = 0;