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

chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.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/webui/local_discovery/local_discovery_ui_handler.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 122 matching lines @@
 }
 
 void LocalDiscoveryUIHandler::HandleCancelRegistration(
     const base::ListValue* args) {
   ResetCurrentRegistration();
 }
 
 void LocalDiscoveryUIHandler::HandleRequestPrinterList(
     const base::ListValue* args) {
   Profile* profile = Profile::FromWebUI(web_ui());
-  OAuth2TokenService* token_service =
+  ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
 
   cloud_print_printer_list_.reset(new CloudPrintPrinterList(
       profile->GetRequestContext(),
       GetCloudPrintBaseUrl(),
       token_service,
+      token_service->GetPrimaryAccountId(),
       this));
   cloud_print_printer_list_->Start();
 }
 
 void LocalDiscoveryUIHandler::HandleOpenCloudPrintURL(
     const base::ListValue* args) {
   std::string url;
   bool rv = args->GetString(0, &url);
   DCHECK(rv);
 
@@ skipping 37 matching lines @@
 
   std::string base_url = GetCloudPrintBaseUrl();
 
   GURL automated_claim_url(base::StringPrintf(
       kPrivetAutomatedClaimURLFormat,
       base_url.c_str(),
       token.c_str()));
 
   Profile* profile = Profile::FromWebUI(web_ui());
 
-  OAuth2TokenService* token_service =
+  ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
 
   if (!token_service) {
     SendRegisterError();
     return;
   }
 
   confirm_api_call_flow_.reset(new PrivetConfirmApiCallFlow(
       profile->GetRequestContext(),
       token_service,
+      token_service->GetPrimaryAccountId(),
       automated_claim_url,
       base::Bind(&LocalDiscoveryUIHandler::OnConfirmDone,
                  base::Unretained(this))));
   confirm_api_call_flow_->Start();
 }
 
 void LocalDiscoveryUIHandler::OnPrivetRegisterError(
     PrivetRegisterOperation* operation,
     const std::string& action,
     PrivetRegisterOperation::FailureReason reason,
@@ skipping 173 matching lines @@
   scoped_ptr<base::DictionaryValue> return_value(new base::DictionaryValue);
 
   return_value->SetString("id", description.id);
   return_value->SetString("display_name", description.display_name);
   return_value->SetString("description", description.description);
 
   return return_value.Pass();
 }
 
 }  // namespace local_discovery