Migrate SMSService to SimpleURLLoader

Bug: 844920
Change-Id: Iabbe4f3367ca8ade1afa09d595bc05483f0e1d49
TBR: pkasting@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/1070328
Commit-Queue: Mark Pilgrim <pilgrim@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Reviewed-by: Peter Lee <pkl@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561687}

chrome/browser/ui/desktop_ios_promotion/desktop_ios_promotion_bubble_controller_unittest.cc

@@ -22,6 +22,7 @@
 #include "components/sync_preferences/pref_service_mock_factory.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "content/public/test/test_browser_thread_bundle.h"
+#include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ui/desktop_ios_promotion/sms_service.cc

@@ -18,9 +18,9 @@
 #include "net/http/http_status_code.h"
 #include "net/http/http_util.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
-#include "net/url_request/url_fetcher.h"
-#include "net/url_request/url_fetcher_delegate.h"
-#include "net/url_request/url_request_context_getter.h"
+#include "services/network/public/cpp/resource_request.h"
+#include "services/network/public/cpp/shared_url_loader_factory.h"
+#include "services/network/public/cpp/simple_url_loader.h"
 
 namespace {
 
@@ -41,8 +41,7 @@ const char kSendSMSPromoFormat[] = "{promo_id:%s}";
 const size_t kMaxRetries = 1;
 
 class RequestImpl : public SMSService::Request,
-                    private OAuth2TokenService::Consumer,
-                    private net::URLFetcherDelegate {
+                    private OAuth2TokenService::Consumer {
  public:
   ~RequestImpl() override {}
 
@@ -58,16 +57,15 @@ class RequestImpl : public SMSService::Request,
  private:
   friend class ::SMSService;
 
-  RequestImpl(
-      OAuth2TokenService* token_service,
+  RequestImpl(OAuth2TokenService* token_service,
               SigninManagerBase* signin_manager,
-      const scoped_refptr<net::URLRequestContextGetter>& request_context,
+              scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
               const GURL& url,
               const SMSService::CompletionCallback& callback)
       : OAuth2TokenService::Consumer("desktop_ios_promotion"),
         token_service_(token_service),
         signin_manager_(signin_manager),
-        request_context_(request_context),
+        url_loader_factory_(std::move(url_loader_factory)),
         url_(url),
         post_data_mime_type_(kPostDataMimeType),
         response_code_(0),
@@ -76,7 +74,7 @@ class RequestImpl : public SMSService::Request,
         is_pending_(false) {
     DCHECK(token_service_);
     DCHECK(signin_manager_);
-    DCHECK(request_context_);
+    DCHECK(url_loader_factory_);
   }
 
   void Start() override {
@@ -87,10 +85,13 @@ class RequestImpl : public SMSService::Request,
     is_pending_ = true;
   }
 
-  // content::URLFetcherDelegate interface.
-  void OnURLFetchComplete(const net::URLFetcher* source) override {
-    DCHECK_EQ(source, url_fetcher_.get());
-    response_code_ = url_fetcher_->GetResponseCode();
+  void OnSimpleLoaderComplete(std::unique_ptr<std::string> response_body) {
+    response_code_ = -1;
+    if (simple_url_loader_->ResponseInfo() &&
+        simple_url_loader_->ResponseInfo()->headers) {
+      response_code_ =
+          simple_url_loader_->ResponseInfo()->headers->response_code();
+    }
 
     UMA_HISTOGRAM_CUSTOM_ENUMERATION(
         "DesktopIOSPromotion.OAuthTokenResponseCode",
@@ -110,10 +111,15 @@ class RequestImpl : public SMSService::Request,
       Start();
       return;
     }
-    url_fetcher_->GetResponseAsString(&response_body_);
-    url_fetcher_.reset();
+    bool success = !!response_body;
+    if (success) {
+      response_body_ = std::move(*response_body);
+    } else {
+      response_body_.clear();
+    }
+    simple_url_loader_.reset();
     is_pending_ = false;
-    callback_.Run(this, response_code_ == net::HTTP_OK);
+    callback_.Run(this, success);
     // It is valid for the callback to delete |this|, so do not access any
     // members below here.
   }
@@ -129,27 +135,6 @@ class RequestImpl : public SMSService::Request,
     UMA_HISTOGRAM_BOOLEAN("DesktopIOSPromotion.OAuthTokenCompletion", true);
 
     // Got an access token -- start the actual API request.
-    url_fetcher_ = CreateUrlFetcher(access_token);
-    url_fetcher_->Start();
-  }
-
-  void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                         const GoogleServiceAuthError& error) override {
-    token_request_.reset();
-    is_pending_ = false;
-
-    UMA_HISTOGRAM_BOOLEAN("DesktopIOSPromotion.OAuthTokenCompletion", false);
-
-    callback_.Run(this, false);
-    // It is valid for the callback to delete |this|, so do not access any
-    // members below here.
-  }
-
-  // Helper for creating a new URLFetcher for the API request.
-  std::unique_ptr<net::URLFetcher> CreateUrlFetcher(
-      const std::string& access_token) {
-    net::URLFetcher::RequestType request_type =
-        post_data_ ? net::URLFetcher::POST : net::URLFetcher::GET;
     net::NetworkTrafficAnnotationTag traffic_annotation =
         net::DefineNetworkTrafficAnnotation("desktop_ios_promotion", R"(
         semantics {
@@ -179,20 +164,39 @@ class RequestImpl : public SMSService::Request,
             "Not implemented, considered not useful as it does not upload any "
             "data and just downloads a recovery number."
         })");
-    std::unique_ptr<net::URLFetcher> fetcher =
-        net::URLFetcher::Create(url_, request_type, this, traffic_annotation);
-    fetcher->SetRequestContext(request_context_.get());
-    fetcher->SetMaxRetriesOn5xx(kMaxRetries);
-    fetcher->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
-                          net::LOAD_DO_NOT_SAVE_COOKIES);
-    fetcher->AddExtraRequestHeader("Authorization: Bearer " + access_token);
-    fetcher->AddExtraRequestHeader(
+    auto resource_request = std::make_unique<network::ResourceRequest>();
+    resource_request->url = url_;
+    resource_request->load_flags =
+        net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES;
+    resource_request->method = post_data_ ? "POST" : "GET";
+    resource_request->headers.AddHeaderFromString("Authorization: Bearer " +
+                                                  access_token);
+    resource_request->headers.AddHeaderFromString(
         "X-Developer-Key: " +
         GaiaUrls::GetInstance()->oauth2_chrome_client_id());
-
+    simple_url_loader_ = network::SimpleURLLoader::Create(
+        std::move(resource_request), traffic_annotation);
+    simple_url_loader_->SetRetryOptions(kMaxRetries,
+                                        network::SimpleURLLoader::RETRY_ON_5XX);
     if (post_data_)
-      fetcher->SetUploadData(post_data_mime_type_, post_data_.value());
-    return fetcher;
+      simple_url_loader_->AttachStringForUpload(post_data_.value(),
+                                                post_data_mime_type_);
+    simple_url_loader_->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
+        url_loader_factory_.get(),
+        base::BindOnce(&RequestImpl::OnSimpleLoaderComplete,
+                       base::Unretained(this)));
+  }
+
+  void OnGetTokenFailure(const OAuth2TokenService::Request* request,
+                         const GoogleServiceAuthError& error) override {
+    token_request_.reset();
+    is_pending_ = false;
+
+    UMA_HISTOGRAM_BOOLEAN("DesktopIOSPromotion.OAuthTokenCompletion", false);
+
+    callback_.Run(this, false);
+    // It is valid for the callback to delete |this|, so do not access any
+    // members below here.
   }
 
   void SetPostData(const std::string& post_data) override {
@@ -207,7 +211,7 @@ class RequestImpl : public SMSService::Request,
 
   OAuth2TokenService* token_service_;
   SigninManagerBase* signin_manager_;
-  scoped_refptr<net::URLRequestContextGetter> request_context_;
+  scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
 
   // The URL of the API endpoint.
   GURL url_;
@@ -225,7 +229,7 @@ class RequestImpl : public SMSService::Request,
   std::string access_token_;
 
   // Handles the actual API requests after the OAuth token is acquired.
-  std::unique_ptr<net::URLFetcher> url_fetcher_;
+  std::unique_ptr<network::SimpleURLLoader> simple_url_loader_;
 
   // Holds the response code received from the server.
   int response_code_;
@@ -253,10 +257,10 @@ SMSService::Request::~Request() {}
 SMSService::SMSService(
     OAuth2TokenService* token_service,
     SigninManagerBase* signin_manager,
-    const scoped_refptr<net::URLRequestContextGetter>& request_context)
+    scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory)
     : token_service_(token_service),
       signin_manager_(signin_manager),
-      request_context_(request_context),
+      url_loader_factory_(std::move(url_loader_factory)),
       weak_ptr_factory_(this) {}
 
 SMSService::~SMSService() {}
@@ -264,8 +268,8 @@ SMSService::~SMSService() {}
 SMSService::Request* SMSService::CreateRequest(
     const GURL& url,
     const CompletionCallback& callback) {
-  return new RequestImpl(token_service_, signin_manager_, request_context_, url,
-                         callback);
+  return new RequestImpl(token_service_, signin_manager_, url_loader_factory_,
+                         url, callback);
 }
 
 void SMSService::QueryPhoneNumber(const PhoneNumberCallback& callback) {

chrome/browser/ui/desktop_ios_promotion/sms_service.h

@@ -19,8 +19,8 @@
 #include "components/keyed_service/core/keyed_service.h"
 #include "url/gurl.h"
 
-namespace net {
-class URLRequestContextGetter;
+namespace network {
+class SharedURLLoaderFactory;
 }
 
 class OAuth2TokenService;
@@ -61,10 +61,9 @@ class SMSService : public KeyedService {
       PhoneNumberCallback;
   typedef base::Callback<void(Request*, bool success)> CompletionCallback;
 
-  SMSService(
-      OAuth2TokenService* token_service,
+  SMSService(OAuth2TokenService* token_service,
              SigninManagerBase* signin_manager,
-      const scoped_refptr<net::URLRequestContextGetter>& request_context);
+             scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory);
   ~SMSService() override;
 
   // Query the logged in user's verified phone number.
@@ -96,7 +95,7 @@ class SMSService : public KeyedService {
   SigninManagerBase* signin_manager_;
 
   // Request context getter to use.
-  scoped_refptr<net::URLRequestContextGetter> request_context_;
+  scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
 
   // Pending expiration requests to be canceled if not complete by profile
   // shutdown.

chrome/browser/ui/desktop_ios_promotion/sms_service_factory.cc

@@ -12,7 +12,9 @@
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
-#include "net/url_request/url_request_context_getter.h"
+#include "content/public/browser/browser_context.h"
+#include "content/public/browser/storage_partition.h"
+#include "services/network/public/cpp/shared_url_loader_factory.h"
 
 // static
 SMSServiceFactory* SMSServiceFactory::GetInstance() {
@@ -31,7 +33,8 @@ KeyedService* SMSServiceFactory::BuildServiceInstanceFor(
   return new SMSService(
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
       SigninManagerFactory::GetForProfile(profile),
-      profile->GetRequestContext());
+      content::BrowserContext::GetDefaultStoragePartition(profile)
+          ->GetURLLoaderFactoryForBrowserProcess());
 }
 
 SMSServiceFactory::SMSServiceFactory()

chrome/browser/ui/desktop_ios_promotion/sms_service_unittest.cc

@@ -11,6 +11,9 @@
 #include "components/signin/core/browser/fake_signin_manager.h"
 #include "components/signin/core/browser/test_signin_client.h"
 #include "net/http/http_status_code.h"
+#include "services/network/public/cpp/shared_url_loader_factory.h"
+#include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
+#include "services/network/test/test_url_loader_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -23,8 +26,8 @@ class TestingSMSService : public SMSService {
   explicit TestingSMSService(
       ProfileOAuth2TokenService* token_service,
       SigninManagerBase* signin_manager,
-      const scoped_refptr<net::URLRequestContextGetter>& request_context)
-      : SMSService(token_service, signin_manager, request_context) {}
+      scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory)
+      : SMSService(token_service, signin_manager, url_loader_factory) {}
 
   ~TestingSMSService() override {}
 
@@ -125,9 +128,12 @@ class SMSServiceTest : public testing::Test {
   SMSServiceTest()
       : signin_client_(nullptr),
         signin_manager_(&signin_client_, &account_tracker_),
-        url_request_context_(new net::TestURLRequestContextGetter(
-            base::ThreadTaskRunnerHandle::Get())),
-        sms_service_(&token_service_, &signin_manager_, url_request_context_) {}
+        test_shared_loader_factory_(
+            base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
+                &test_url_loader_factory_)),
+        sms_service_(&token_service_,
+                     &signin_manager_,
+                     test_shared_loader_factory_) {}
 
   ~SMSServiceTest() override {}
 
@@ -151,7 +157,8 @@ class SMSServiceTest : public testing::Test {
   AccountTrackerService account_tracker_;
   TestSigninClient signin_client_;
   FakeSigninManagerBase signin_manager_;
-  scoped_refptr<net::URLRequestContextGetter> url_request_context_;
+  network::TestURLLoaderFactory test_url_loader_factory_;
+  scoped_refptr<network::SharedURLLoaderFactory> test_shared_loader_factory_;
   TestingSMSService sms_service_;
 
   DISALLOW_COPY_AND_ASSIGN(SMSServiceTest);