Change AuthenticatingURLLoader to be a URLLoaderInterceptor

shell/application_manager/application_manager.h

 // Copyright 2014 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_APPLICATION_MANAGER_H_
 #define SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
 
 #include <map>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/interfaces/application/application.mojom.h"
 #include "mojo/public/interfaces/application/service_provider.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/url_response_disk_cache/public/interfaces/url_response_disk_cache.mojom.h"
 #include "shell/application_manager/application_loader.h"
 #include "shell/application_manager/identity.h"
 #include "shell/application_manager/native_runner.h"
 #include "shell/native_application_support.h"
 #include "url/gurl.h"
 
 namespace base {
 class FilePath;
 class SequencedWorkerPool;
@@ skipping 205 matching lines @@
   scoped_ptr<NativeRunnerFactory> native_runner_factory_;
 
   IdentityToShellImplMap identity_to_shell_impl_;
   URLToContentHandlerMap url_to_content_handler_;
   URLToArgsMap url_to_args_;
   // Note: The keys are URLs after mapping and resolving.
   URLToNativeOptionsMap url_to_native_options_;
 
   base::SequencedWorkerPool* blocking_pool_;
   mojo::URLResponseDiskCachePtr url_response_disk_cache_;
+  mojo::NetworkServicePtr network_service_;
   mojo::AuthenticatingURLLoaderFactoryPtr url_loader_factory_;

[qsr, 2015/06/05 10:54:55]

I don't think you need to keep this as a member. You just create it and pass it
along.

[blundell, 2015/06/05 13:24:17]

Done.

   MimeTypeToURLMap mime_type_to_url_;
   ScopedVector<NativeRunner> native_runners_;
   bool initialized_authentication_service_;
   base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
 };
 
 }  // namespace shell
 
 #endif  // SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_