Change AuthenticatingURLLoader to be a URLLoaderInterceptor

shell/application_manager/network_fetcher.h

 // Copyright 2015 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.
 
 #ifndef SHELL_APPLICATION_MANAGER_NETWORK_FETCHER_H_
 #define SHELL_APPLICATION_MANAGER_NETWORK_FETCHER_H_
 
 #include "shell/application_manager/fetcher.h"
 
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/services/authenticating_url_loader/public/interfaces/authenticating_url_loader.mojom.h"
-#include "mojo/services/authenticating_url_loader/public/interfaces/authenticating_url_loader_factory.mojom.h"
+#include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
 #include "mojo/services/url_response_disk_cache/public/interfaces/url_response_disk_cache.mojom.h"
 #include "url/gurl.h"
 
 namespace shell {
 
 // Implements Fetcher for http[s] files.
 class NetworkFetcher : public Fetcher {
  public:
   NetworkFetcher(bool disable_cache,
                  bool predictable_app_filenames,
                  const GURL& url,
                  mojo::URLResponseDiskCache* url_response_disk_cache,
-                 mojo::AuthenticatingURLLoaderFactory* url_loader_factory,
+                 mojo::NetworkService* network_service,
                  const FetchCallback& loader_callback);
 
   ~NetworkFetcher() override;
 
  private:
   // TODO(hansmuller): Revisit this when a real peek operation is available.
   static const MojoDeadline kPeekTimeout = MOJO_DEADLINE_INDEFINITE;
 
   const GURL& GetURL() const override;
   GURL GetRedirectURL() const override;
@@ skipping 21 matching lines @@
   void AsPath(
       base::TaskRunner* task_runner,
       base::Callback<void(const base::FilePath&, bool)> callback) override;
 
   std::string MimeType() override;
 
   bool HasMojoMagic() override;
 
   bool PeekFirstLine(std::string* line) override;
 
-  void StartNetworkRequest(
-      const GURL& url,
-      mojo::AuthenticatingURLLoaderFactory* url_loader_factory);
+  void StartNetworkRequest(const GURL& url,
+                           mojo::NetworkService* network_service);
 
   void OnLoadComplete(mojo::URLResponsePtr response);
 
   const bool disable_cache_;
   const bool predictable_app_filenames_;
   const GURL url_;
   mojo::URLResponseDiskCache* url_response_disk_cache_;
-  mojo::AuthenticatingURLLoaderPtr url_loader_;
+  mojo::URLLoaderPtr url_loader_;
   mojo::URLResponsePtr response_;
   base::FilePath path_;
   base::WeakPtrFactory<NetworkFetcher> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkFetcher);
 };
 
 }  // namespace shell
 
 #endif  // SHELL_APPLICATION_MANAGER_NETWORK_FETCHER_H_