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

chrome/browser/ui/webui/print_preview/print_preview_handler.cc

 // Copyright (c) 2012 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/webui/print_preview/print_preview_handler.h"
 
 #include <ctype.h>
 
 #include <string>
 
@@ skipping 241 matching lines @@
  public:
   explicit AccessTokenService(PrintPreviewHandler* handler)
       : handler_(handler) {
   }
 
   void RequestToken(const std::string& type) {
     if (requests_.find(type) != requests_.end())
       return;  // Already in progress.
 
     OAuth2TokenService* service = NULL;
+    std::string account_id;
     if (type == "profile") {
       Profile* profile = Profile::FromWebUI(handler_->web_ui());
-      if (profile)
-        service = ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
+      if (profile) {
+        ProfileOAuth2TokenService* token_service =
+            ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
+        account_id = token_service->GetPrimaryAccountId();
+        service = token_service;
+      }
     } else if (type == "device") {
 #if defined(OS_CHROMEOS)
-      service = chromeos::DeviceOAuth2TokenServiceFactory::Get();
+      chromeos::DeviceOAuth2TokenService* token_service =
+          chromeos::DeviceOAuth2TokenServiceFactory::Get();
+      account_id = token_service->GetDeviceAccountId();
+      service = token_service;
 #endif
     }
 
     if (service) {
       OAuth2TokenService::ScopeSet oauth_scopes;
       oauth_scopes.insert(cloud_print::kCloudPrintAuth);
       scoped_ptr<OAuth2TokenService::Request> request(
-          service->StartRequest(oauth_scopes, this));
+          service->StartRequest(account_id, oauth_scopes, this));
       requests_[type].reset(request.release());
     } else {
       handler_->SendAccessToken(type, std::string());  // Unknown type.
     }
   }
 
   virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                                  const std::string& access_token,
                                  const base::Time& expiration_time) OVERRIDE {
     OnServiceResponce(request, access_token);
@@ skipping 762 matching lines @@
   if (!tmp_data.get()) {
     // Nothing to print, no preview available.
     return false;
   }
   DCHECK(tmp_data->size() && tmp_data->front());
 
   *data = tmp_data;
   *title = print_preview_ui->initiator_title();
   return true;
 }