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

chrome/browser/local_discovery/privet_confirm_api_flow_unittest.cc

Index: chrome/browser/local_discovery/privet_confirm_api_flow_unittest.cc
diff --git a/chrome/browser/local_discovery/privet_confirm_api_flow_unittest.cc b/chrome/browser/local_discovery/privet_confirm_api_flow_unittest.cc
index 0ec365e98168ea0b16e00204c7267756579f60fd..f4e9c0b3d46c555cf1b5d4db6fc7681a8d668eaf 100644
--- a/chrome/browser/local_discovery/privet_confirm_api_flow_unittest.cc
+++ b/chrome/browser/local_discovery/privet_confirm_api_flow_unittest.cc
@@ -40,7 +40,7 @@ class TestOAuth2TokenService : public OAuth2TokenService {
       : request_context_(request_context) {
   }
  protected:
-  virtual std::string GetRefreshToken() OVERRIDE {
+  virtual std::string GetRefreshToken(const std::string& account_id) OVERRIDE {
     return "SampleToken";
   }
 
@@ -88,6 +88,7 @@ class PrivetConfirmApiFlowTest : public testing::Test {
 TEST_F(PrivetConfirmApiFlowTest, Success) {
   PrivetConfirmApiCallFlow confirm_flow(request_context_.get(),
                                         &token_service_,
+                                        std::string(),
                                         GURL("http://SoMeUrL.com"),
                                         callback_.callback());
 
@@ -118,6 +119,7 @@ TEST_F(PrivetConfirmApiFlowTest, Success) {
 TEST_F(PrivetConfirmApiFlowTest, BadToken) {
   PrivetConfirmApiCallFlow confirm_flow(request_context_.get(),
                                         &token_service_,
+                                        std::string(),
                                         GURL("http://SoMeUrL.com"),
                                         callback_.callback());
 
@@ -130,6 +132,7 @@ TEST_F(PrivetConfirmApiFlowTest, BadToken) {
 TEST_F(PrivetConfirmApiFlowTest, ServerFailure) {
   PrivetConfirmApiCallFlow confirm_flow(request_context_.get(),
                                         &token_service_,
+                                        std::string(),
                                         GURL("http://SoMeUrL.com"),
                                         callback_.callback());
 
@@ -152,6 +155,7 @@ TEST_F(PrivetConfirmApiFlowTest, ServerFailure) {
 TEST_F(PrivetConfirmApiFlowTest, BadJson) {
   PrivetConfirmApiCallFlow confirm_flow(request_context_.get(),
                                         &token_service_,
+                                        std::string(),
                                         GURL("http://SoMeUrL.com"),
                                         callback_.callback());