summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-27 16:42:20 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-27 16:42:20 +0000
commit2bd6ca1c42b1c5f3dfe1734a49c697adc22246f6 (patch)
treea7aba3f6a60e08bf29d2cc90e2d343f3530b812c /chrome/browser/net
parentd1fda80b9254869bab3ca816c135088c9724970e (diff)
downloadchromium_src-2bd6ca1c42b1c5f3dfe1734a49c697adc22246f6.zip
chromium_src-2bd6ca1c42b1c5f3dfe1734a49c697adc22246f6.tar.gz
chromium_src-2bd6ca1c42b1c5f3dfe1734a49c697adc22246f6.tar.bz2
Revert r24606-24607. The tree didn't like them. :(
TBR=darin Review URL: http://codereview.chromium.org/173574 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24608 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net')
-rw-r--r--chrome/browser/net/url_request_mock_link_doctor_job.cc40
-rw-r--r--chrome/browser/net/url_request_mock_link_doctor_job.h23
-rw-r--r--chrome/browser/net/url_request_mock_util.cc2
3 files changed, 0 insertions, 65 deletions
diff --git a/chrome/browser/net/url_request_mock_link_doctor_job.cc b/chrome/browser/net/url_request_mock_link_doctor_job.cc
deleted file mode 100644
index 88ef438..0000000
--- a/chrome/browser/net/url_request_mock_link_doctor_job.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2009 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 "chrome/browser/net/url_request_mock_link_doctor_job.h"
-
-#include "base/path_service.h"
-#include "chrome/browser/google_util.h"
-#include "chrome/common/chrome_paths.h"
-#include "googleurl/src/gurl.h"
-#include "net/url_request/url_request_filter.h"
-
-namespace {
-
-FilePath GetMockFilePath() {
- FilePath test_dir;
- bool success = PathService::Get(chrome::DIR_TEST_DATA, &test_dir);
- DCHECK(success);
- return test_dir.AppendASCII("mock-link-doctor.html");
-}
-
-} // namespace
-
-/* static */
-URLRequestJob* URLRequestMockLinkDoctorJob::Factory(URLRequest* request,
- const std::string& scheme) {
- return new URLRequestMockLinkDoctorJob(request);
-}
-
-/* static */
-void URLRequestMockLinkDoctorJob::AddUrlHandler() {
- URLRequestFilter* filter = URLRequestFilter::GetInstance();
- filter->AddHostnameHandler("http",
- GURL(google_util::kLinkDoctorBaseURL).host(),
- URLRequestMockLinkDoctorJob::Factory);
-}
-
-URLRequestMockLinkDoctorJob::URLRequestMockLinkDoctorJob(URLRequest* request)
- : URLRequestMockHTTPJob(request, GetMockFilePath()) {
-}
diff --git a/chrome/browser/net/url_request_mock_link_doctor_job.h b/chrome/browser/net/url_request_mock_link_doctor_job.h
deleted file mode 100644
index 74fd00e..0000000
--- a/chrome/browser/net/url_request_mock_link_doctor_job.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2009 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.
-//
-// A URLRequestJob class that substitutes LinkDoctor requests.
-
-#ifndef CHROME_BROWSER_NET_URL_REQUEST_MOCK_LINK_DOCTOR_JOB_H_
-#define CHROME_BROWSER_NET_URL_REQUEST_MOCK_LINK_DOCTOR_JOB_H_
-
-#include "chrome/browser/net/url_request_mock_http_job.h"
-
-class URLRequestMockLinkDoctorJob : public URLRequestMockHTTPJob {
- public:
- URLRequestMockLinkDoctorJob(URLRequest* request);
- virtual ~URLRequestMockLinkDoctorJob() { }
-
- static URLRequest::ProtocolFactory Factory;
-
- // Adds the testing URLs to the URLRequestFilter.
- static void AddUrlHandler();
-};
-
-# endif // CHROME_BROWSER_NET_URL_REQUEST_MOCK_LINK_DOCTOR_JOB_H_
diff --git a/chrome/browser/net/url_request_mock_util.cc b/chrome/browser/net/url_request_mock_util.cc
index 680ed1d..9a559b1 100644
--- a/chrome/browser/net/url_request_mock_util.cc
+++ b/chrome/browser/net/url_request_mock_util.cc
@@ -10,7 +10,6 @@
#include "chrome/browser/chrome_thread.h"
#include "chrome/browser/net/url_request_failed_dns_job.h"
#include "chrome/browser/net/url_request_mock_http_job.h"
-#include "chrome/browser/net/url_request_mock_link_doctor_job.h"
#include "chrome/browser/net/url_request_slow_download_job.h"
#include "chrome/browser/net/url_request_slow_http_job.h"
#include "chrome/common/chrome_paths.h"
@@ -27,7 +26,6 @@ void SetUrlRequestMocksEnabled(bool enabled) {
URLRequestFilter::GetInstance()->ClearHandlers();
URLRequestFailedDnsJob::AddUrlHandler();
- URLRequestMockLinkDoctorJob::AddUrlHandler();
URLRequestSlowDownloadJob::AddUrlHandler();
std::wstring root_http;