Refactor AO2TS to make it easier to componentize.

chrome/browser/supervised_user/child_accounts/family_info_fetcher.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 "chrome/browser/supervised_user/child_accounts/family_info_fetcher.h"
 
 #include "base/json/json_reader.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "net/base/load_flags.h"
@@ skipping 184 matching lines @@
     consumer_->OnFailure(NETWORK_ERROR);
     return;
   }
 
   int response_code = source->GetResponseCode();
   if (response_code == net::HTTP_UNAUTHORIZED && !access_token_expired_) {
     DVLOG(1) << "Access token expired, retrying";
     access_token_expired_ = true;
     OAuth2TokenService::ScopeSet scopes;
     scopes.insert(kScope);
-    token_service_->InvalidateToken(account_id_, scopes, access_token_);
+    token_service_->InvalidateAccessToken(account_id_, scopes, access_token_);
     StartFetching();
     return;
   }
 
   if (response_code != net::HTTP_OK) {
     DLOG(WARNING) << "HTTP error " << response_code;
     consumer_->OnFailure(NETWORK_ERROR);
     return;
   }
 
@@ skipping 94 matching lines @@
     consumer_->OnFailure(SERVICE_ERROR);
     return;
   }
   std::vector<FamilyMember> members;
   if (!ParseMembers(members_list, &members)){
     consumer_->OnFailure(SERVICE_ERROR);
     return;
   }
   consumer_->OnGetFamilyMembersSuccess(members);
 }