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 163 matching lines @@
     return;
   }
 
   GURL automated_claim_url(base::StringPrintf(
       kPrivetAutomatedClaimURLFormat,
       device_descriptions_[current_http_client_->GetName()].url.c_str(),
       token.c_str()));
 
   Profile* profile = Profile::FromWebUI(web_ui());
 
-  OAuth2TokenService* token_service =
+  ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
 
   if (!token_service) {
     LogRegisterErrorToWeb("Could not get token service");
     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,
@@ skipping 89 matching lines @@
 }
 
 void LocalDiscoveryUIHandler::SetIsVisible(bool visible) {
   if (visible != is_visible_) {
     g_num_visible += visible ? 1 : -1;
     is_visible_ = visible;
   }
 }
 
 }  // namespace local_discovery