diff options
| -rw-r--r-- | chrome/browser/autofill/autofill_download.cc | 16 | ||||
| -rw-r--r-- | chrome/browser/autofill/autofill_download.h | 1 | ||||
| -rw-r--r-- | chrome/browser/autofill/autofill_download_unittest.cc | 2 |
3 files changed, 1 insertions, 18 deletions
diff --git a/chrome/browser/autofill/autofill_download.cc b/chrome/browser/autofill/autofill_download.cc index f2011ef..4211a80 100644 --- a/chrome/browser/autofill/autofill_download.cc +++ b/chrome/browser/autofill/autofill_download.cc @@ -17,19 +17,11 @@ #include "chrome/common/pref_names.h" #include "net/http/http_response_headers.h" -#define DISABLED_REQUEST_URL "http://disabled" - -#if defined(GOOGLE_CHROME_BUILD) #define AUTO_FILL_QUERY_SERVER_REQUEST_URL \ "http://toolbarqueries.clients.google.com:80/tbproxy/af/query" #define AUTO_FILL_UPLOAD_SERVER_REQUEST_URL \ "http://toolbarqueries.clients.google.com:80/tbproxy/af/upload" #define AUTO_FILL_QUERY_SERVER_NAME_START_IN_HEADER "GFE/" -#else -#define AUTO_FILL_QUERY_SERVER_REQUEST_URL DISABLED_REQUEST_URL -#define AUTO_FILL_UPLOAD_SERVER_REQUEST_URL DISABLED_REQUEST_URL -#define AUTO_FILL_QUERY_SERVER_NAME_START_IN_HEADER "SOMESERVER/" -#endif namespace { const size_t kMaxFormCacheSize = 16; @@ -48,8 +40,7 @@ AutoFillDownloadManager::AutoFillDownloadManager(Profile* profile) next_upload_request_(base::Time::Now()), positive_upload_rate_(0), negative_upload_rate_(0), - fetcher_id_for_unittest_(0), - is_testing_(false) { + fetcher_id_for_unittest_(0) { // |profile_| could be NULL in some unit-tests. if (profile_) { PrefService* preferences = profile_->GetPrefs(); @@ -188,11 +179,6 @@ bool AutoFillDownloadManager::StartRequest( else request_url = AUTO_FILL_UPLOAD_SERVER_REQUEST_URL; - if (!request_url.compare(DISABLED_REQUEST_URL) && !is_testing_) { - // We have it disabled - return true as if it succeeded, but do nothing. - return true; - } - // Id is ignored for regular chrome, in unit test id's for fake fetcher // factory will be 0, 1, 2, ... URLFetcher *fetcher = URLFetcher::Create(fetcher_id_for_unittest_++, diff --git a/chrome/browser/autofill/autofill_download.h b/chrome/browser/autofill/autofill_download.h index 157062c..fbbf838 100644 --- a/chrome/browser/autofill/autofill_download.h +++ b/chrome/browser/autofill/autofill_download.h @@ -162,7 +162,6 @@ class AutoFillDownloadManager : public URLFetcher::Delegate { // Needed for unit-test. int fetcher_id_for_unittest_; - bool is_testing_; }; #endif // CHROME_BROWSER_AUTOFILL_AUTOFILL_DOWNLOAD_H_ diff --git a/chrome/browser/autofill/autofill_download_unittest.cc b/chrome/browser/autofill/autofill_download_unittest.cc index b9967d6..099df01 100644 --- a/chrome/browser/autofill/autofill_download_unittest.cc +++ b/chrome/browser/autofill/autofill_download_unittest.cc @@ -46,8 +46,6 @@ class AutoFillDownloadTestHelper : public AutoFillDownloadManager::Observer { AutoFillDownloadTestHelper() : download_manager(&profile) { download_manager.SetObserver(this); - // For chromium builds forces Start*Request to actually execute. - download_manager.is_testing_ = true; } ~AutoFillDownloadTestHelper() { download_manager.SetObserver(NULL); |