Initial refactoring complete

chrome/browser/profiles/profile.h

 // Copyright (c) 2011 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.
 
 // This class gathers state related to a single user profile.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_H_
 #pragma once
 
@@ skipping 23 matching lines @@
 }
 
 namespace prerender {
 class PrerenderManager;
 }
 
 namespace webkit_database {
 class DatabaseTracker;
 }
 
+class AuthenticationService;
 class AutocompleteClassifier;
 class BackgroundContentsService;
 class BookmarkModel;
 class BrowserSignin;
 class ChromeAppCacheService;
 class ChromeBlobStorageContext;
 class ChromeURLDataManager;
 class CloudPrintProxyService;
 class DesktopNotificationService;
 class DownloadManager;
@@ skipping 349 matching lines @@
   // Returns true if the last time this profile was open it was exited cleanly.
   virtual bool DidLastSessionExitCleanly() = 0;
 
   // Returns the BookmarkModel, creating if not yet created.
   virtual BookmarkModel* GetBookmarkModel() = 0;
 
   // Returns the ProtocolHandlerRegistry, creating if not yet created.
   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;
 
   // Returns the ProfileSyncService, creating if not yet created, with
   // the specified CrOS username.
   virtual ProfileSyncService* GetProfileSyncService(
       const std::string& cros_user) = 0;
 
   // Returns the CloudPrintProxyService, creating if not yet created.
   virtual CloudPrintProxyService* GetCloudPrintProxyService() = 0;
@@ skipping 159 matching lines @@
   bool restored_last_session_;
 
   // Accessibility events will only be propagated when the pause
   // level is zero.  PauseAccessibilityEvents and ResumeAccessibilityEvents
   // increment and decrement the level, respectively, rather than set it to
   // true or false, so that calls can be nested.
   int accessibility_pause_level_;
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_H_