Making OAuth2TokenService multi-login aware, updating callers, minor fixes

chrome/browser/ui/app_list/search/people/people_provider.cc

 // Copyright 2013 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/ui/app_list/search/people/people_provider.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 110 matching lines @@
     const GoogleServiceAuthError& error) {
   DCHECK_EQ(access_token_request_, request);
   access_token_request_.reset();
 }
 
 void PeopleProvider::RequestAccessToken() {
   // Only one active request at a time.
   if (access_token_request_ != NULL)
     return;
 
-  OAuth2TokenService* token_service =
+  ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
-  access_token_request_ = token_service->StartRequest(oauth2_scope_, this);
+  access_token_request_ = token_service->StartRequest(
+      token_service->GetPrimaryAccountId(), oauth2_scope_, this);
 }
 
 GURL PeopleProvider::GetQueryUrl(const std::string& query) {
   GURL people_search_url = people_search_url_;
   people_search_url = net::AppendQueryParameter(people_search_url,
                                                 kAccessTokenField,
                                                 access_token_);
   people_search_url = net::AppendQueryParameter(people_search_url,
                                                 kQueryField,
                                                 query);
@@ skipping 101 matching lines @@
 
 void PeopleProvider::SetupForTest(
     const base::Closure& people_search_fetched_callback,
     const GURL& people_search_url) {
   people_search_fetched_callback_ = people_search_fetched_callback;
   people_search_url_ = people_search_url;
   skip_request_token_for_test_ = true;
 }
 
 }  // namespace app_list