summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-11 05:32:23 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-11 05:32:23 +0000
commit10c2d69eef670a8870a53c5a0afee74810d416d6 (patch)
treec7b102852b40953ebb1da5ecce5f2a9cab0eccdb /chrome/browser/sync
parent8623b0f992684cf2bca8fc27f733ad1c31cdd8f8 (diff)
downloadchromium_src-10c2d69eef670a8870a53c5a0afee74810d416d6.zip
chromium_src-10c2d69eef670a8870a53c5a0afee74810d416d6.tar.gz
chromium_src-10c2d69eef670a8870a53c5a0afee74810d416d6.tar.bz2
Move URLFetcherDelegate to net/ and split URLFetcher between net/ and content/
Temporarily make a shim content::URLFetcherDelegate class. A future CL will replace all instances of content::URLFetcherDelegate with net::URLFetcherDelegate and remove that class. Move most URLFetcher methods to net::URLFetcher, except for the static methods (which will be handled in a future CL) and AssociateWithRenderView, which is content-specific. Replace all instances of content::URLFetcher* in the URLFetcherDelegate callbacks with net::URLFetcher* (except for rlz, which required its own special hack). BUG=118220 TEST= TBR=mnissler@chromium.org,jhawkins@chromium.org,cpu@chromium.org,estade@chromium.org,sky@chromium.org,joth@chromium.org,satish@chromium.org Review URL: https://chromiumcodereview.appspot.com/10386063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
-rw-r--r--chrome/browser/sync/glue/http_bridge.cc2
-rw-r--r--chrome/browser/sync/glue/http_bridge.h2
-rw-r--r--chrome/browser/sync/test/integration/sync_test.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/sync/glue/http_bridge.cc b/chrome/browser/sync/glue/http_bridge.cc
index e7a217f..ebf08e5 100644
--- a/chrome/browser/sync/glue/http_bridge.cc
+++ b/chrome/browser/sync/glue/http_bridge.cc
@@ -281,7 +281,7 @@ void HttpBridge::DestroyURLFetcherOnIOThread(content::URLFetcher* fetcher) {
delete fetcher;
}
-void HttpBridge::OnURLFetchComplete(const content::URLFetcher *source) {
+void HttpBridge::OnURLFetchComplete(const net::URLFetcher* source) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
base::AutoLock lock(fetch_state_lock_);
if (fetch_state_.aborted)
diff --git a/chrome/browser/sync/glue/http_bridge.h b/chrome/browser/sync/glue/http_bridge.h
index a26410d..2131440 100644
--- a/chrome/browser/sync/glue/http_bridge.h
+++ b/chrome/browser/sync/glue/http_bridge.h
@@ -123,7 +123,7 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>,
const std::string& name) const OVERRIDE;
// content::URLFetcherDelegate implementation.
- virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE;
+ virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
#if defined(UNIT_TEST)
net::URLRequestContextGetter* GetRequestContextGetter() const {
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index 5467cff..d2bae7d 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -84,7 +84,7 @@ class SyncServerStatusChecker : public content::URLFetcherDelegate {
public:
SyncServerStatusChecker() : running_(false) {}
- virtual void OnURLFetchComplete(const content::URLFetcher* source) {
+ virtual void OnURLFetchComplete(const net::URLFetcher* source) {
std::string data;
source->GetResponseAsString(&data);
running_ =