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

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

Index: chrome/browser/ui/webui/print_preview/print_preview_handler.cc
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index c1f15cdd4523adfc9efe21865952bae46c58ec2a..3d7b8d249fe26dbfeadfd096f3d8c4d7412c1c7a 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -259,13 +259,21 @@ class PrintPreviewHandler::AccessTokenService
       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
     }
 
@@ -273,7 +281,7 @@ class PrintPreviewHandler::AccessTokenService
       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.