diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-24 16:24:13 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-25 14:13:32 +0100 |
| commit | 3f50c38dc070f4bb515c1b64450dae14f316474e (patch) | |
| tree | 29f309f9534e05c47244eedb438fc612578d133b /chrome/browser/net/url_request_mock_net_error_job.cc | |
| parent | e23bef148f7be2bdf9c3cb2cd3aa5ceebf1190fb (diff) | |
| download | external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.zip external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.tar.gz external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.tar.bz2 | |
Merge Chromium at r10.0.634.0: Initial merge by git.
Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
Diffstat (limited to 'chrome/browser/net/url_request_mock_net_error_job.cc')
| -rw-r--r-- | chrome/browser/net/url_request_mock_net_error_job.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/net/url_request_mock_net_error_job.cc b/chrome/browser/net/url_request_mock_net_error_job.cc index 5f66bc4..b88b160 100644 --- a/chrome/browser/net/url_request_mock_net_error_job.cc +++ b/chrome/browser/net/url_request_mock_net_error_job.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -44,7 +44,7 @@ void URLRequestMockNetErrorJob::AddMockedURL(const GURL& url, #endif url_mock_info_map_[url] = MockInfo(base, errors, ssl_cert); - URLRequestFilter::GetInstance() + net::URLRequestFilter::GetInstance() ->AddUrlHandler(url, &URLRequestMockNetErrorJob::Factory); } @@ -53,7 +53,7 @@ void URLRequestMockNetErrorJob::RemoveMockedURL(const GURL& url) { URLMockInfoMap::iterator iter = url_mock_info_map_.find(url); DCHECK(iter != url_mock_info_map_.end()); url_mock_info_map_.erase(iter); - URLRequestFilter::GetInstance()->RemoveUrlHandler(url); + net::URLRequestFilter::GetInstance()->RemoveUrlHandler(url); } // static |