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

chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc

 // Copyright (c) 2012 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/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 344 matching lines @@
 
     // Key installation, policy load and refresh token save.
     device_settings_test_helper_.set_policy_blob(loaded_blob_);
     owner_key_util_->SetPublicKeyFromPrivateKey(
         *device_policy_.GetNewSigningKey());
     ReloadDeviceSettings();
 
     if (done_)
       return;
 
+    chromeos::DeviceOAuth2TokenService* token_service =
+        chromeos::DeviceOAuth2TokenServiceFactory::Get();
     // Process robot refresh token store.
     EXPECT_EQ(
         "refreshToken4Test",
-        chromeos::DeviceOAuth2TokenServiceFactory::Get()->GetRefreshToken());
+        token_service->GetRefreshToken(token_service->GetDeviceAccountId()));
   }
 
   bool is_auto_enrollment_;
 
   DeviceManagementStatus register_status_;
   em::DeviceManagementResponse register_response_;
 
   DeviceManagementStatus policy_fetch_status_;
   em::DeviceManagementResponse policy_fetch_response_;
 
@@ skipping 108 matching lines @@
 TEST_F(DeviceCloudPolicyManagerChromeOSEnrollmentTest, LoadError) {
   loaded_blob_.clear();
   RunTest();
   ExpectFailedEnrollment(EnrollmentStatus::STATUS_STORE_ERROR);
   EXPECT_EQ(CloudPolicyStore::STATUS_LOAD_ERROR,
             status_.store_status());
 }
 
 }  // namespace
 }  // namespace policy