Refactor AO2TS to make it easier to componentize.

extensions/shell/browser/api/identity/identity_api.cc

 // Copyright 2014 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 "extensions/shell/browser/api/identity/identity_api.h"
 
 #include <set>
 #include <string>
 
 #include "base/guid.h"
@@ skipping 47 matching lines @@
     OAuth2MintTokenFlow* flow) {
   mint_token_flow_.reset(flow);
 }
 
 ExtensionFunction::ResponseAction IdentityGetAuthTokenFunction::Run() {
   scoped_ptr<api::identity::GetAuthToken::Params> params(
       api::identity::GetAuthToken::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   ShellOAuth2TokenService* service = ShellOAuth2TokenService::GetInstance();
-  std::string account_id = service->account_id();
+  std::string account_id = service->AccountId();
   if (account_id.empty())
     return RespondNow(Error(kErrorNoUserAccount));
 
   if (!service->RefreshTokenIsAvailable(account_id))
     return RespondNow(Error(kErrorNoRefreshToken));
 
   // Verify that we have scopes.
   const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension());
   if (oauth2_info.scopes.empty())
     return RespondNow(Error(kErrorNoScopesInManifest));
 
   // Balanced in OnGetTokenFailure() and in the OAuth2MintTokenFlow callbacks.
   AddRef();
 
   // First, fetch a logged-in-user access token for the Chrome project client ID
   // and client secret. This token is used later to get a second access token
   // that will be returned to the app.
   std::set<std::string> no_scopes;
   access_token_request_ =
-      service->StartRequest(service->account_id(), no_scopes, this);
+      service->StartRequest(service->AccountId(), no_scopes, this);
   return RespondLater();
 }
 
 void IdentityGetAuthTokenFunction::OnGetTokenSuccess(
     const OAuth2TokenService::Request* request,
     const std::string& access_token,
     const base::Time& expiration_time) {
   // Tests may override the mint token flow.
   if (!mint_token_flow_) {
     const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(extension());
@@ skipping 52 matching lines @@
   scoped_ptr<api::identity::RemoveCachedAuthToken::Params> params(
       api::identity::RemoveCachedAuthToken::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   // This stub identity API does not maintain a token cache, so there is nothing
   // to remove.
   return RespondNow(NoArguments());
 }
 
 }  // namespace shell
 }  // namespace extensions