| Index: chrome/browser/extensions/webstore_install_helper.h
|
| diff --git a/chrome/browser/extensions/webstore_install_helper.h b/chrome/browser/extensions/webstore_install_helper.h
|
| index 06a144022f2909156b8861eba9d8910933f4ccf5..ff57a73f9a81a15cfb62f42f8c47aec68c88233c 100644
|
| --- a/chrome/browser/extensions/webstore_install_helper.h
|
| +++ b/chrome/browser/extensions/webstore_install_helper.h
|
| @@ -11,8 +11,8 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "content/public/browser/utility_process_host_client.h"
|
| -#include "content/public/common/url_fetcher_delegate.h"
|
| #include "googleurl/src/gurl.h"
|
| +#include "net/url_request/url_fetcher_delegate.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
|
|
| class SkBitmap;
|
| @@ -27,6 +27,7 @@ class UtilityProcessHost;
|
| }
|
|
|
| namespace net {
|
| +class URLFetcher;
|
| class URLRequestContextGetter;
|
| }
|
|
|
| @@ -35,7 +36,7 @@ class URLRequestContextGetter;
|
| // fetching/decoding icon data. Clients must implement the
|
| // WebstoreInstallHelper::Delegate interface to receive the parsed data.
|
| class WebstoreInstallHelper : public content::UtilityProcessHostClient,
|
| - public content::URLFetcherDelegate {
|
| + public net::URLFetcherDelegate {
|
| public:
|
| class Delegate {
|
| public:
|
| @@ -78,7 +79,7 @@ class WebstoreInstallHelper : public content::UtilityProcessHostClient,
|
| void ReportResultsIfComplete();
|
| void ReportResultFromUIThread();
|
|
|
| - // Implementing the content::URLFetcherDelegate interface.
|
| + // Implementing the net::URLFetcherDelegate interface.
|
| virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
|
|
|
| // Implementing pieces of the UtilityProcessHostClient interface.
|
| @@ -108,7 +109,7 @@ class WebstoreInstallHelper : public content::UtilityProcessHostClient,
|
| std::vector<unsigned char> fetched_icon_data_;
|
|
|
| // For fetching the icon, if needed.
|
| - scoped_ptr<content::URLFetcher> url_fetcher_;
|
| + scoped_ptr<net::URLFetcher> url_fetcher_;
|
| net::URLRequestContextGetter* context_getter_; // Only usable on UI thread.
|
|
|
| base::WeakPtr<content::UtilityProcessHost> utility_host_;
|
|
|