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 "base/bind.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/local_discovery/privet_device_lister_impl.h"
@@ skipping 164 matching lines @@
   std::string base_url = GetCloudPrintBaseUrl(current_http_client_->GetName());
 
   GURL automated_claim_url(base::StringPrintf(
       kPrivetAutomatedClaimURLFormat,
       base_url.c_str(),
       token.c_str()));
 
   Profile* profile = Profile::FromWebUI(web_ui());
 
   if (current_register_user_index_ == kAccountIndexUseOAuth2) {
-    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();
   } else {
     if (current_register_user_index_ == 0) {
       StartCookieConfirmFlow(current_register_user_index_,
                              xsrf_token_for_primary_user_,
                              automated_claim_url);
     } else {
@@ skipping 166 matching lines @@
 
   confirm_api_call_flow_.reset();
   privet_resolution_.reset();
   cloud_print_account_manager_.reset();
   xsrf_token_for_primary_user_.clear();
   current_register_user_index_ = 0;
   current_http_client_.reset();
 }
 
 }  // namespace local_discovery