diff options
| author | jdonnelly <jdonnelly@chromium.org> | 2015-09-17 17:49:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-18 00:49:59 +0000 |
| commit | 4dff1d58fa60695afac0aa3da11634378c0d7aad (patch) | |
| tree | 2a50edb16b2ec50596d39ffd2841d490afd08cdf /mojo/package_manager | |
| parent | 27bc389884c6f6214dacb8ce44c7623d863aaf12 (diff) | |
| download | chromium_src-4dff1d58fa60695afac0aa3da11634378c0d7aad.zip chromium_src-4dff1d58fa60695afac0aa3da11634378c0d7aad.tar.gz chromium_src-4dff1d58fa60695afac0aa3da11634378c0d7aad.tar.bz2 | |
Revert of Some more minor cleanup to ApplicationManager. (patchset #4 id:60001 of https://codereview.chromium.org/1351963002/ )
Reason for revert:
Broke Android GN.
Original issue's description:
> Some more minor cleanup to ApplicationManager.
>
> R=yzshen@chromium.org
> http://crbug.com/533085
>
> Committed: https://crrev.com/c6bde172a35b65b5a735675e840fab55921d28f8
> Cr-Commit-Position: refs/heads/master@{#349515}
TBR=yzshen@chromium.org,ben@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1354043002
Cr-Commit-Position: refs/heads/master@{#349554}
Diffstat (limited to 'mojo/package_manager')
| -rw-r--r-- | mojo/package_manager/package_manager_impl.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mojo/package_manager/package_manager_impl.cc b/mojo/package_manager/package_manager_impl.cc index 8d8e19e..a2af6c1 100644 --- a/mojo/package_manager/package_manager_impl.cc +++ b/mojo/package_manager/package_manager_impl.cc @@ -11,7 +11,6 @@ #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" @@ -80,8 +79,8 @@ void PackageManagerImpl::FetchRequest( // 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. @@ -100,8 +99,7 @@ void PackageManagerImpl::FetchRequest( 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); @@ -110,8 +108,8 @@ void PackageManagerImpl::FetchRequest( #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|. |