Refactor AO2TS to make it easier to componentize.

chrome/browser/chromeos/settings/device_oauth2_token_service_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 "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/policy/device_policy_builder.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
+#include "chrome/browser/chromeos/settings/device_oauth2_token_service_delegate.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
 #include "chrome/browser/chromeos/settings/token_encryptor.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/scoped_testing_local_state.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chromeos/cryptohome/system_salt_getter.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_cryptohome_client.h"
 #include "components/ownership/mock_owner_key_util.h"
@@ skipping 98 matching lines @@
     TestingBrowserProcess::GetGlobal()->SetBrowserPolicyConnector(NULL);
     content::BrowserThread::GetBlockingPool()->FlushForTesting();
     DeviceSettingsService::Get()->UnsetSessionManager();
     DeviceSettingsService::Shutdown();
     SystemSaltGetter::Shutdown();
     DBusThreadManager::Shutdown();
     base::RunLoop().RunUntilIdle();
   }
 
   void CreateService() {
-    oauth2_service_.reset(new DeviceOAuth2TokenService(
-        request_context_getter_.get(), scoped_testing_local_state_.Get()));
-    oauth2_service_->max_refresh_token_validation_retries_ = 0;
+    oauth2_service_.reset(
+        new DeviceOAuth2TokenService(new DeviceOAuth2TokenServiceDelegate(
+            request_context_getter_.get(), scoped_testing_local_state_.Get())));
+    static_cast<DeviceOAuth2TokenServiceDelegate*>(

[Mattias Nissler (ping if slow), 2015/07/01 12:34:14]

This is much cleaner if you just create the DeviceOAuth2TokenServiceDelegate
instance and hold on to it in a local variable, then set
max_refresh_token_validation_retries_ = 0, then pass the pointer on to the
DeviceOAuth2TokenService ctor.

[gogerald1, 2015/07/01 17:58:42]

Done.

+        oauth2_service_->GetDelegate())->max_refresh_token_validation_retries_ =
+        0;
     oauth2_service_->set_max_authorization_token_fetch_retries_for_testing(0);
   }
 
   // Utility method to set a value in Local State for the device refresh token
   // (it must have a non-empty value or it won't be used).
   void SetDeviceRefreshTokenInLocalState(const std::string& refresh_token) {
     scoped_testing_local_state_.Get()->SetUserPref(
         prefs::kDeviceRobotAnyApiRefreshToken,
         new base::StringValue(refresh_token));
   }
 
   std::string GetValidTokenInfoResponse(const std::string email) {
     return "{ \"email\": \"" + email + "\","
            "  \"user_id\": \"1234567890\" }";
   }
 
   bool RefreshTokenIsAvailable() {
     return oauth2_service_->RefreshTokenIsAvailable(
         oauth2_service_->GetRobotAccountId());
   }
 
   std::string GetRefreshToken() {
     if (!RefreshTokenIsAvailable())
       return std::string();
 
-    return oauth2_service_->GetRefreshToken(
-        oauth2_service_->GetRobotAccountId());
+    return static_cast<DeviceOAuth2TokenServiceDelegate*>(
+               oauth2_service_->GetDelegate())
+        ->GetRefreshToken(oauth2_service_->GetRobotAccountId());
   }
 
   // A utility method to return fake URL results, for testing the refresh token
   // validation logic.  For a successful validation attempt, this method will be
   // called three times for the steps listed below (steps 1 and 2 happen in
   // parallel).
   //
   // Step 1a: fetch the access token for the tokeninfo API.
   // Step 1b: call the tokeninfo API.
   // Step 2:  Fetch the access token for the requested scope
@@ skipping 295 matching lines @@
   // Also make the robot account ID available. Verify that the token is
   // announced now.
   EXPECT_CALL(observer, OnRefreshTokenAvailable("robot@example.com"));
   SetRobotAccountId("robot@example.com");
   testing::Mock::VerifyAndClearExpectations(&observer);
 
   oauth2_service_->RemoveObserver(&observer);
 }
 
 }  // namespace chromeos