Convert FeedbackUploaderChrome to use Identity Service

BUG=797942
R=blundell@chromium.org

Change-Id: I51f4a5830f26c945747e9f9d3b48482b46c5239f
Reviewed-on: https://chromium-review.googlesource.com/1078848Reviewed-by: Colin Blundell <blundell@chromium.org>
Commit-Queue: Jochen Eisinger <jochen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#564870}

chrome/browser/feedback/feedback_uploader_chrome.cc

@@ -6,12 +6,10 @@
 
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
-#include "chrome/browser/signin/signin_manager_factory.h"
-#include "components/signin/core/browser/profile_oauth2_token_service.h"
-#include "components/signin/core/browser/signin_manager.h"
-#include "content/public/browser/browser_context.h"
+#include "chrome/browser/signin/identity_manager_factory.h"
 #include "net/url_request/url_fetcher.h"
+#include "services/identity/public/cpp/identity_manager.h"
+#include "services/identity/public/cpp/primary_account_access_token_fetcher.h"
 
 namespace feedback {
 
@@ -25,44 +23,46 @@ constexpr char kAuthenticationErrorLogMessage[] =
 FeedbackUploaderChrome::FeedbackUploaderChrome(
     content::BrowserContext* context,
     scoped_refptr<base::SingleThreadTaskRunner> task_runner)
-    : OAuth2TokenService::Consumer("feedback_uploader_chrome"),
-      FeedbackUploader(context, task_runner) {}
+    : FeedbackUploader(context, task_runner) {}
 
 FeedbackUploaderChrome::~FeedbackUploaderChrome() = default;
 
-void FeedbackUploaderChrome::OnGetTokenSuccess(
-    const OAuth2TokenService::Request* request,
-    const std::string& access_token,
-    const base::Time& expiration_time) {
-  access_token_request_.reset();
-  access_token_ = access_token;
-  FeedbackUploader::StartDispatchingReport();
-}
-
-void FeedbackUploaderChrome::OnGetTokenFailure(
-    const OAuth2TokenService::Request* request,
-    const GoogleServiceAuthError& error) {
-  LOG(ERROR) << "Failed to get the access token. "
-             << kAuthenticationErrorLogMessage;
-  access_token_request_.reset();
+void FeedbackUploaderChrome::AccessTokenAvailable(
+    const GoogleServiceAuthError& error,
+    const std::string& access_token) {
+  DCHECK(token_fetcher_);
+  std::unique_ptr<identity::PrimaryAccountAccessTokenFetcher>
+      token_fetcher_deleter(std::move(token_fetcher_));
+  if (error.state() == GoogleServiceAuthError::NONE) {
+    DCHECK(!access_token.empty());
+    access_token_ = access_token;
+  } else {
+    LOG(ERROR) << "Failed to get the access token. "
+               << kAuthenticationErrorLogMessage;
+  }
   FeedbackUploader::StartDispatchingReport();
 }
 
 void FeedbackUploaderChrome::StartDispatchingReport() {
   access_token_.clear();
 
+  // TODO(crbug.com/849591): Instead of getting the IdentityManager from the
+  // profile, we should pass the IdentityManager to FeedbackUploaderChrome's
+  // ctor.
   Profile* profile = Profile::FromBrowserContext(context());
   DCHECK(profile);
-  auto* oauth2_token_service =
-      ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
-  auto* signin_manager = SigninManagerFactory::GetForProfile(profile);
-  if (oauth2_token_service && signin_manager &&
-      signin_manager->IsAuthenticated()) {
-    std::string account_id = signin_manager->GetAuthenticatedAccountId();
+  identity::IdentityManager* identity_manager =
+      IdentityManagerFactory::GetForProfile(profile);
+
+  if (identity_manager && identity_manager->HasPrimaryAccount()) {
     OAuth2TokenService::ScopeSet scopes;
     scopes.insert("https://www.googleapis.com/auth/supportcontent");
-    access_token_request_ =
-        oauth2_token_service->StartRequest(account_id, scopes, this);
+    token_fetcher_ =
+        identity_manager->CreateAccessTokenFetcherForPrimaryAccount(
+            "feedback_uploader_chrome", scopes,
+            base::BindOnce(&FeedbackUploaderChrome::AccessTokenAvailable,
+                           base::Unretained(this)),
+            identity::PrimaryAccountAccessTokenFetcher::Mode::kImmediate);
     return;
   }
 

chrome/browser/feedback/feedback_uploader_chrome.h

@@ -10,12 +10,16 @@
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "components/feedback/feedback_uploader.h"
-#include "google_apis/gaia/oauth2_token_service.h"
+
+namespace identity {
+class PrimaryAccountAccessTokenFetcher;
+}  // namespace identity
+
+class GoogleServiceAuthError;
 
 namespace feedback {
 
-class FeedbackUploaderChrome : public OAuth2TokenService::Consumer,
-                               public FeedbackUploader {
+class FeedbackUploaderChrome : public FeedbackUploader {
  public:
   FeedbackUploaderChrome(
       content::BrowserContext* context,
@@ -23,18 +27,14 @@ class FeedbackUploaderChrome : public OAuth2TokenService::Consumer,
   ~FeedbackUploaderChrome() override;
 
  private:
-  // OAuth2TokenService::Consumer:
-  void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
-                         const std::string& access_token,
-                         const base::Time& expiration_time) override;
-  void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                         const GoogleServiceAuthError& error) override;
-
   // feedback::FeedbackUploader:
   void StartDispatchingReport() override;
   void AppendExtraHeadersToUploadRequest(net::URLFetcher* fetcher) override;
 
-  std::unique_ptr<OAuth2TokenService::Request> access_token_request_;
+  void AccessTokenAvailable(const GoogleServiceAuthError& error,
+                            const std::string& access_token);
+
+  std::unique_ptr<identity::PrimaryAccountAccessTokenFetcher> token_fetcher_;
 
   std::string access_token_;