[ios] Migrate OmahaService to SimpleURLLoader

URLFetcher will stop working with advent of Network Service, and
SimpleURLLoader is the replacement API for most clients.
This CL migrates iOS' OmahaService and its respective
unittests away from URLFetcher.

BUG=879774

Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: I60339c7599c6174951056c5a8b867aa6df1438da
Reviewed-on: https://chromium-review.googlesource.com/1227191Reviewed-by: David Roger <droger@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Cr-Commit-Position: refs/heads/master@{#592006}

ios/chrome/app/startup_tasks.mm

@@ -19,6 +19,7 @@
 #include "ios/chrome/browser/reading_list/reading_list_download_service_factory.h"
 #import "ios/chrome/browser/ui/main/browser_view_information.h"
 #import "ios/chrome/browser/upgrade/upgrade_center.h"
+#include "services/network/public/cpp/shared_url_loader_factory.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
@@ -63,9 +64,7 @@ NSString* const kStartProfileStartupTaskRunners =
     return;
   // Start omaha service. We only do this on official builds.
   OmahaService::Start(
-      GetApplicationContext()
-          ->GetIOSChromeIOThread()
-          ->system_url_request_context_getter(),
+      GetApplicationContext()->GetSharedURLLoaderFactory()->Clone(),
       base::BindRepeating(^(const UpgradeRecommendedDetails& details) {
         [[UpgradeCenter sharedInstance] upgradeNotificationDidOccur:details];
       }));

ios/chrome/browser/omaha/BUILD.gn

@@ -51,6 +51,7 @@ source_set("unit_tests") {
     "//ios/web",
     "//ios/web/public/test",
     "//net:test_support",
+    "//services/network:test_support",
     "//testing/gtest",
   ]
 }

ios/chrome/browser/omaha/omaha_service.h

@@ -14,16 +14,16 @@
 #include "base/scoped_observer.h"
 #include "base/timer/timer.h"
 #include "base/version.h"
-#include "net/url_request/url_fetcher_delegate.h"
 
 namespace base {
 class DictionaryValue;
 }
 
-namespace net {
-class URLFetcher;
-class URLRequestContextGetter;
-}
+namespace network {
+class SharedURLLoaderFactory;
+class SharedURLLoaderFactoryInfo;
+class SimpleURLLoader;
+}  // namespace network
 
 struct UpgradeRecommendedDetails;
 
@@ -31,15 +31,16 @@ struct UpgradeRecommendedDetails;
 // handles all the scheduling necessary to contact the server regularly.
 // All methods, but the constructor, |GetInstance| and |Start| methods, must be
 // called from the IO thread.
-class OmahaService : public net::URLFetcherDelegate {
+class OmahaService {
  public:
   // Called when an upgrade is recommended.
   using UpgradeRecommendedCallback =
       base::Callback<void(const UpgradeRecommendedDetails&)>;
 
-  // Starts the service. Also set the |URLRequestContextGetter| necessary to
+  // Starts the service. Also set the |URLLoaderFactory| necessary to
   // access the Omaha server. This method should only be called once.
-  static void Start(net::URLRequestContextGetter* request_context_getter,
+  static void Start(std::unique_ptr<network::SharedURLLoaderFactoryInfo>
+                        url_loader_factory_info,
                     const UpgradeRecommendedCallback& callback);
 
   // Returns debug information about the omaha service.
@@ -78,8 +79,7 @@ class OmahaService : public net::URLFetcherDelegate {
   // Initialize the timer. Used on startup.
   void Initialize();
 
-  // net::URLFetcherDelegate
-  void OnURLFetchComplete(const net::URLFetcher* fetcher) override;
+  void OnURLLoadComplete(std::unique_ptr<std::string> response_body);
 
   // Raw GetInstance method. Necessary for using singletons.
   static OmahaService* GetInstance();
@@ -88,7 +88,7 @@ class OmahaService : public net::URLFetcherDelegate {
   OmahaService();
   // Private constructor, only used for tests.
   explicit OmahaService(bool schedule);
-  ~OmahaService() override;
+  ~OmahaService();
 
   // Returns the time to wait before next attempt.
   static base::TimeDelta GetBackOff(uint8_t number_of_tries);
@@ -146,12 +146,17 @@ class OmahaService : public net::URLFetcherDelegate {
   // called after a successful installation/update ping.
   void ClearInstallRetryRequestId();
 
+  // Initialize the URLLoaderFactory instance (mostly needed for tests).
+  void InitializeURLLoaderFactory(
+      scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory);
+
   // Clears the all persistent state. Should only be used for testing.
   static void ClearPersistentStateForTests();
 
   // To communicate with the Omaha server.
-  std::unique_ptr<net::URLFetcher> fetcher_;
-  net::URLRequestContextGetter* request_context_getter_;
+  std::unique_ptr<network::SimpleURLLoader> url_loader_;
+  std::unique_ptr<network::SharedURLLoaderFactoryInfo> url_loader_factory_info_;
+  scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
 
   // The timer that call this object back when needed.
   base::OneShotTimer timer_;

ios/chrome/browser/omaha/omaha_service.mm

@@ -42,6 +42,8 @@
 #include "net/base/backoff_entry.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
+#include "services/network/public/cpp/shared_url_loader_factory.h"
+#include "services/network/public/cpp/simple_url_loader.h"
 #include "url/gurl.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -294,15 +296,16 @@ OmahaService* OmahaService::GetInstance() {
 }
 
 // static
-void OmahaService::Start(net::URLRequestContextGetter* request_context_getter,
+void OmahaService::Start(std::unique_ptr<network::SharedURLLoaderFactoryInfo>
+                             url_loader_factory_info,
                          const UpgradeRecommendedCallback& callback) {
-  DCHECK(request_context_getter);
+  DCHECK(url_loader_factory_info);
   DCHECK(!callback.is_null());
   OmahaService* result = GetInstance();
   result->set_upgrade_recommended_callback(callback);
   // This should only be called once.
-  DCHECK(!result->request_context_getter_);
-  result->request_context_getter_ = request_context_getter;
+  DCHECK(!result->url_loader_factory_info_ || !result->url_loader_factory_);
+  result->url_loader_factory_info_ = std::move(url_loader_factory_info);
   result->locale_lang_ = GetApplicationContext()->GetApplicationLocale();
   base::PostTaskWithTraits(FROM_HERE, {web::WebThread::IO},
                            base::Bind(&OmahaService::SendOrScheduleNextPing,
@@ -310,16 +313,14 @@ void OmahaService::Start(net::URLRequestContextGetter* request_context_getter,
 }
 
 OmahaService::OmahaService()
-    : request_context_getter_(NULL),
-      schedule_(true),
+    : schedule_(true),
       application_install_date_(0),
       sending_install_event_(false) {
   Initialize();
 }
 
 OmahaService::OmahaService(bool schedule)
-    : request_context_getter_(NULL),
-      schedule_(schedule),
+    : schedule_(schedule),
       application_install_date_(0),
       sending_install_event_(false) {
   Initialize();
@@ -524,7 +525,7 @@ std::string OmahaService::GetCurrentPingContent() {
 
 void OmahaService::SendPing() {
   // Check that no request is in progress.
-  DCHECK(!fetcher_);
+  DCHECK(!url_loader_);
 
   GURL url(ios::GetChromeBrowserProvider()
                ->GetOmahaServiceProvider()
@@ -533,17 +534,30 @@ void OmahaService::SendPing() {
     return;
   }
 
-  fetcher_ = net::URLFetcher::Create(0, url, net::URLFetcher::POST, this);
-  fetcher_->SetRequestContext(request_context_getter_);
-  fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
-                         net::LOAD_DO_NOT_SAVE_COOKIES);
-  fetcher_->SetUploadData("text/xml", GetCurrentPingContent());
+  // There are 2 situations here:
+  // 1) production code, where |url_loader_factory_info_| is used.
+  // 2) testing code, where the |url_loader_factory_| creation is triggered by
+  // the test.
+  if (url_loader_factory_info_) {
+    DCHECK(!url_loader_factory_);
+    url_loader_factory_ = network::SharedURLLoaderFactory::Create(
+        std::move(url_loader_factory_info_));
+  }
+
+  DCHECK(url_loader_factory_);
+
+  auto resource_request = std::make_unique<network::ResourceRequest>();
+  resource_request->url = url;
+  resource_request->method = "POST";
+  resource_request->load_flags =
+      net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES;
 
   // If this is not the first try, notify the omaha server.
   if (number_of_tries_ && IsNextPingInstallRetry()) {
-    fetcher_->SetExtraRequestHeaders(base::StringPrintf(
-        "X-RequestAge: %lld",
-        (base::Time::Now() - current_ping_time_).InSeconds()));
+    resource_request->headers.SetHeader(
+        "X-RequestAge",
+        base::StringPrintf(
+            "%lld", (base::Time::Now() - current_ping_time_).InSeconds()));
   }
 
   // Update last fail time and number of tries, so that if anything fails
@@ -553,7 +567,12 @@ void OmahaService::SendPing() {
   next_tries_time_ = base::Time::Now() + GetBackOff(number_of_tries_);
   PersistStates();
 
-  fetcher_->Start();
+  url_loader_ = network::SimpleURLLoader::Create(std::move(resource_request),
+                                                 NO_TRAFFIC_ANNOTATION_YET);
+  url_loader_->AttachStringForUpload(GetCurrentPingContent(), "text/xml");
+  url_loader_->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
+      url_loader_factory_.get(),
+      base::BindOnce(&OmahaService::OnURLLoadComplete, base::Unretained(this)));
 }
 
 void OmahaService::SendOrScheduleNextPing() {
@@ -563,8 +582,9 @@ void OmahaService::SendOrScheduleNextPing() {
     return;
   }
   if (schedule_) {
-    timer_.Start(FROM_HERE, next_tries_time_ - now, this,
-                 &OmahaService::SendPing);
+    timer_.Start(
+        FROM_HERE, next_tries_time_ - now,
+        base::BindOnce(&OmahaService::SendPing, base::Unretained(this)));
   }
 }
 
@@ -585,21 +605,19 @@ void OmahaService::PersistStates() {
   [defaults synchronize];
 }
 
-void OmahaService::OnURLFetchComplete(const net::URLFetcher* fetcher) {
-  DCHECK(fetcher_.get() == fetcher);
-  // Transfer the ownership of fetcher_ to this method.
-  std::unique_ptr<net::URLFetcher> local_fetcher = std::move(fetcher_);
+void OmahaService::OnURLLoadComplete(
+    std::unique_ptr<std::string> response_body) {
+  // Reset the loader.
+  url_loader_.reset();
 
-  if (fetcher->GetResponseCode() != 200) {
+  if (!response_body) {
     DLOG(WARNING) << "Error contacting the Omaha server";
     SendOrScheduleNextPing();
     return;
   }
 
-  std::string response;
-  bool result = fetcher->GetResponseAsString(&response);
-  DCHECK(result);
-  NSData* xml = [NSData dataWithBytes:response.data() length:response.length()];
+  NSData* xml = [NSData dataWithBytes:response_body->data()
+                               length:response_body->length()];
   NSXMLParser* parser = [[NSXMLParser alloc] initWithData:xml];
   const std::string application_id = ios::GetChromeBrowserProvider()
                                          ->GetOmahaServiceProvider()
@@ -701,6 +719,11 @@ void OmahaService::ClearInstallRetryRequestId() {
   [defaults synchronize];
 }
 
+void OmahaService::InitializeURLLoaderFactory(
+    scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory) {
+  url_loader_factory_ = url_loader_factory;
+}
+
 void OmahaService::ClearPersistentStateForTests() {
   NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
   [defaults removeObjectForKey:kNextTriesTimesKey];