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

chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc

Index: chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc
diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc
index f31e1052de6799e2394836f35dcdc27e03bf9bd6..236843fd26b1b6be6634747bb779f136d01d7754 100644
--- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc
+++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc
@@ -149,13 +149,14 @@ void LocalDiscoveryUIHandler::HandleCancelRegistration(
 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();
 }
@@ -229,7 +230,7 @@ void LocalDiscoveryUIHandler::OnPrivetRegisterClaimToken(
 
   Profile* profile = Profile::FromWebUI(web_ui());
 
-  OAuth2TokenService* token_service =
+  ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
 
   if (!token_service) {
@@ -240,6 +241,7 @@ void LocalDiscoveryUIHandler::OnPrivetRegisterClaimToken(
   confirm_api_call_flow_.reset(new PrivetConfirmApiCallFlow(
       profile->GetRequestContext(),
       token_service,
+      token_service->GetPrimaryAccountId(),
       automated_claim_url,
       base::Bind(&LocalDiscoveryUIHandler::OnConfirmDone,
                  base::Unretained(this))));