Revert of Some more minor cleanup to ApplicationManager.

mojo/package_manager/package_manager_impl.cc

 // 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.
 
 #include "mojo/package_manager/package_manager_impl.h"
 
 #include "mojo/fetcher/about_fetcher.h"
 #include "mojo/fetcher/local_fetcher.h"
 #include "mojo/fetcher/network_fetcher.h"
 #include "mojo/fetcher/switches.h"
 #include "mojo/fetcher/update_fetcher.h"
 #include "mojo/shell/application_manager.h"
-#include "mojo/shell/connect_util.h"
 #include "mojo/shell/query_util.h"
 #include "mojo/shell/switches.h"
 #include "mojo/util/filename_util.h"
 #include "url/gurl.h"
 
 namespace mojo {
 namespace package_manager {
 
 PackageManagerImpl::PackageManagerImpl(
     const base::FilePath& shell_file_root)
@@ skipping 43 matching lines @@
     fetcher::AboutFetcher::Start(url, loader_callback);
     return;
   }
 
   GURL resolved_url = ResolveURL(url);
 
   if (resolved_url.SchemeIsFile()) {
     // LocalFetcher uses the network service to infer MIME types from URLs.
     // Skip this for mojo URLs to avoid recursively loading the network service.
     if (!network_service_ && !url.SchemeIs("mojo")) {
-      shell::ConnectToService(application_manager_,
-                              GURL("mojo:network_service"), &network_service_);
+      application_manager_->ConnectToService(GURL("mojo:network_service"),
+                                            &network_service_);
     }
     // Ownership of this object is transferred to |loader_callback|.
     // TODO(beng): this is eff'n weird.
     new fetcher::LocalFetcher(
         network_service_.get(), resolved_url,
         shell::GetBaseURLAndQuery(resolved_url, nullptr),
         loader_callback);
     return;
   }
 
 #if 0
   // TODO(beng): figure out how this should be integrated now that mapped_url
   //             is toast.
   // TODO(scottmg): to quote someone I know, if you liked this you shouldda put
   //                a test on it.
   if (url.SchemeIs("mojo") &&
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUseUpdater)) {
-    shell::ConnectToService(application_manager_, GURL("mojo:updater"),
-                            &updater_);
+    application_manager_->ConnectToService(GURL("mojo:updater"), &updater_);
     // Ownership of this object is transferred to |loader_callback|.
     // TODO(beng): this is eff'n weird.
     new fetcher::UpdateFetcher(url, updater_.get(), loader_callback);
     return;
   }
 #endif
 
   if (!url_loader_factory_) {
-    shell::ConnectToService(application_manager_, GURL("mojo:network_service"),
-                            &url_loader_factory_);
+    application_manager_->ConnectToService(GURL("mojo:network_service"),
+                                           &url_loader_factory_);
   }
 
   // Ownership of this object is transferred to |loader_callback|.
   // TODO(beng): this is eff'n weird.
   new fetcher::NetworkFetcher(disable_cache_, request.Pass(),
                               url_loader_factory_.get(), loader_callback);
 }
 
 bool PackageManagerImpl::HandleWithContentHandler(shell::Fetcher* fetcher,
                                                   const GURL& unresolved_url,
@@ skipping 46 matching lines @@
                                       : std::string();
     *content_handler_url = alias_iter->second.first;
     return true;
   }
 
   return false;
 }
 
 }  // namespace package_manager
 }  // namespace mojo