Eliminate ProfileOAuth2TokenService being a BCKS.

chrome/browser/signin/fake_profile_oauth2_token_service.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/signin/fake_profile_oauth2_token_service.h"
 
 #include "base/message_loop/message_loop.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_account_id_helper.h"
+#include "content/public/browser/browser_context.h"
+
+namespace {
+
+class FakeProfileOAuth2TokenServiceWrapper

[blundell, 2014/02/10 16:19:16]

This class will eventually have to be split into its own file as the FakePO2TS
will move into the component. Should I do that in this CL do you think?

[Roger Tawa OOO till Jul 10th, 2014/02/10 19:49:13]

Probably makes sense to do it as part of this CL, since its about adding the new
layer of indirection.  Otherwise its a TODO that we'll need schedule later.

[blundell, 2014/02/13 16:07:06]

Done.

+    : public ProfileOAuth2TokenServiceWrapper {
+ public:
+  FakeProfileOAuth2TokenServiceWrapper(Profile* profile,
+                                       bool auto_issue_tokens) {
+    if (auto_issue_tokens)
+      service_.set_auto_post_fetch_response_on_message_loop(true);
+    service_.Initialize(reinterpret_cast<Profile*>(profile));
+  }
+  virtual ~FakeProfileOAuth2TokenServiceWrapper() { service_.Shutdown(); }
+
+  virtual ProfileOAuth2TokenService* GetProfileOAuth2TokenService() OVERRIDE {
+    return &service_;
+  }
+
+ private:
+  FakeProfileOAuth2TokenService service_;
+};

[Roger Tawa OOO till Jul 10th, 2014/02/10 19:49:13]

Crazy idea, but if you make this class a template like:

   template<ServiceClass> class PO2TSWrapper : ... { 
     ...
     ServiceClass service_;
   };

and move the template to profile_oauth2_token_service_factory.h, you should be
able to reuse it for the fake, mutable and android cases without change.  Here
it would:

   PO2TSWrapper<FakeProfileOAuth2TokenService>

and in the real factory it would be:

   PO2TSWrapper<PlatformSpecificOAuth2TokenService>

The set_auto_post_fetch_response_on_message_loop() call can be left in
BuildAutoIssuingTokenService().  Would that be better?

[blundell, 2014/02/13 16:07:06]

It's actually only needed for the fake. Additionally, it's not clear to me
whether the call to set auto_post_fetch_response has to be done before the call
to Initialize(). For now I didn't take this suggestion -- let me know what you
think.

On 2014/02/10 19:49:13, Roger Tawa wrote:

+
+}  // namespace
 
 FakeProfileOAuth2TokenService::PendingRequest::PendingRequest() {
 }
 
 FakeProfileOAuth2TokenService::PendingRequest::~PendingRequest() {
 }
 
 // static
 BrowserContextKeyedService* FakeProfileOAuth2TokenService::Build(
-    content::BrowserContext* profile) {
-  FakeProfileOAuth2TokenService* service = new FakeProfileOAuth2TokenService();
-  service->Initialize(reinterpret_cast<Profile*>(profile));
-  return service;
+    content::BrowserContext* context) {
+  Profile* profile = static_cast<Profile*>(context);
+  return new FakeProfileOAuth2TokenServiceWrapper(profile, false);
 }
 
 BrowserContextKeyedService*
 FakeProfileOAuth2TokenService::BuildAutoIssuingTokenService(
-    content::BrowserContext* profile) {
-  FakeProfileOAuth2TokenService* service = new FakeProfileOAuth2TokenService();
-  service->set_auto_post_fetch_response_on_message_loop(true);
-  service->Initialize(reinterpret_cast<Profile*>(profile));
-  return service;
+    content::BrowserContext* context) {
+  Profile* profile = static_cast<Profile*>(context);
+  return new FakeProfileOAuth2TokenServiceWrapper(profile, true);
 }
 
 FakeProfileOAuth2TokenService::FakeProfileOAuth2TokenService()
     : auto_post_fetch_response_on_message_loop_(false) {
   SigninAccountIdHelper::SetDisableForTest(true);
 }
 
 FakeProfileOAuth2TokenService::~FakeProfileOAuth2TokenService() {
   SigninAccountIdHelper::SetDisableForTest(false);
 }
@@ skipping 147 matching lines @@
   }
 }
 
 void FakeProfileOAuth2TokenService::InvalidateOAuth2Token(
     const std::string& account_id,
     const std::string& client_id,
     const ScopeSet& scopes,
     const std::string& access_token) {
   // Do nothing, as we don't have a cache from which to remove the token.
 }