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

chrome/browser/local_discovery/cloud_print_printer_list_unittest.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 <set>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/local_discovery/cloud_print_printer_list.h"
 #include "content/public/test/test_browser_thread.h"
@@ skipping 23 matching lines @@
     "      \"description\": \"someDescription\"}"
     "    ]"
     "}";
 
 class TestOAuth2TokenService : public OAuth2TokenService {
  public:
   explicit TestOAuth2TokenService(net::URLRequestContextGetter* request_context)
       : request_context_(request_context) {
   }
  protected:
-  virtual std::string GetRefreshToken() OVERRIDE {
+  virtual std::string GetRefreshToken(const std::string& account_id) OVERRIDE {
     return "SampleToken";
   }
 
   virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE {
     return request_context_.get();
   }
 
  private:
   scoped_refptr<net::URLRequestContextGetter> request_context_;
 };
@@ skipping 11 matching lines @@
                    &loop_),
         request_context_(new net::TestURLRequestContextGetter(
             base::MessageLoopProxy::current())),
         token_service_(request_context_.get()) {
     ui_thread_.Stop();  // HACK: Fake being on the UI thread
 
     printer_list_.reset(
         new CloudPrintPrinterList(request_context_.get(),
                                   "http://SoMeUrL.com/cloudprint",
                                   &token_service_,
+                                  "account_id",
                                   &delegate_));
 
     fallback_fetcher_factory_.reset(new net::TestURLFetcherFactory());
     net::URLFetcherImpl::set_factory(NULL);
     fetcher_factory_.reset(new net::FakeURLFetcherFactory(
         fallback_fetcher_factory_.get()));
   }
 
   virtual ~CloudPrintPrinterListTest() {
     fetcher_factory_.reset();
@@ skipping 51 matching lines @@
       printer_list_->GetDetailsFor("someID");
   ASSERT_TRUE(found != NULL);
   EXPECT_EQ("someID", found->id);
   EXPECT_EQ("someDisplayName", found->display_name);
   EXPECT_EQ("someDescription", found->description);
 }
 
 }  // namespace
 
 }  // namespace local_discovery