summaryrefslogtreecommitdiffstats
path: root/chrome/browser/translate
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 02:12:44 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 02:12:44 +0000
commitf90bf0d9264f7f272b7f4a65f864cb7170417fe8 (patch)
tree3df23eb7b118bfd40c7601df6245d869b56ced49 /chrome/browser/translate
parent56d8cf25ee047078688c8af5917fcfbc63ac749b (diff)
downloadchromium_src-f90bf0d9264f7f272b7f4a65f864cb7170417fe8.zip
chromium_src-f90bf0d9264f7f272b7f4a65f864cb7170417fe8.tar.gz
chromium_src-f90bf0d9264f7f272b7f4a65f864cb7170417fe8.tar.bz2
net: Remove typedef net::URLRequestStatus URLRequestStatus;
BUG=64263 TEST=compiled locally, trybots Review URL: http://codereview.chromium.org/6166010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71285 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/translate')
-rw-r--r--chrome/browser/translate/translate_manager.cc7
-rw-r--r--chrome/browser/translate/translate_manager_unittest.cc8
2 files changed, 8 insertions, 7 deletions
diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc
index 40fbae6..446a87f 100644
--- a/chrome/browser/translate/translate_manager.cc
+++ b/chrome/browser/translate/translate_manager.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -280,7 +280,7 @@ void TranslateManager::Observe(NotificationType type,
void TranslateManager::OnURLFetchComplete(const URLFetcher* source,
const GURL& url,
- const URLRequestStatus& status,
+ const net::URLRequestStatus& status,
int response_code,
const ResponseCookies& cookies,
const std::string& data) {
@@ -288,7 +288,8 @@ void TranslateManager::OnURLFetchComplete(const URLFetcher* source,
DCHECK(translate_script_request_pending_);
translate_script_request_pending_ = false;
bool error =
- (status.status() != URLRequestStatus::SUCCESS || response_code != 200);
+ (status.status() != net::URLRequestStatus::SUCCESS ||
+ response_code != 200);
if (!error) {
base::StringPiece str = ResourceBundle::GetSharedInstance().
diff --git a/chrome/browser/translate/translate_manager_unittest.cc b/chrome/browser/translate/translate_manager_unittest.cc
index 89cc355..f821b5c 100644
--- a/chrome/browser/translate/translate_manager_unittest.cc
+++ b/chrome/browser/translate/translate_manager_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -181,9 +181,9 @@ class TranslateManagerTest : public RenderViewHostTestHarness,
void SimulateURLFetch(bool success) {
TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(0);
ASSERT_TRUE(fetcher);
- URLRequestStatus status;
- status.set_status(success ? URLRequestStatus::SUCCESS :
- URLRequestStatus::FAILED);
+ net::URLRequestStatus status;
+ status.set_status(success ? net::URLRequestStatus::SUCCESS :
+ net::URLRequestStatus::FAILED);
fetcher->delegate()->OnURLFetchComplete(fetcher, fetcher->original_url(),
status, success ? 200 : 500,
ResponseCookies(),