Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(628)

Unified Diff: chrome/browser/policy/device_management_service_unittest.cc

Issue 6166010: net: Remove typedef net::URLRequestStatus URLRequestStatus; (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/policy/device_management_service_unittest.cc
diff --git a/chrome/browser/policy/device_management_service_unittest.cc b/chrome/browser/policy/device_management_service_unittest.cc
index 1a1142474ca922ad1bfb1249f2fdd85ec094e5c4..4162a3fdc79672e255761679be565048d3704ba4 100644
--- a/chrome/browser/policy/device_management_service_unittest.cc
+++ b/chrome/browser/policy/device_management_service_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.
@@ -82,7 +82,7 @@ class DeviceManagementServiceTestBase : public TESTBASE {
struct FailedRequestParams {
FailedRequestParams(DeviceManagementBackend::ErrorCode expected_error,
- URLRequestStatus::Status request_status,
+ net::URLRequestStatus::Status request_status,
int http_status,
const std::string& response)
: expected_error_(expected_error),
@@ -91,7 +91,7 @@ struct FailedRequestParams {
response_(response) {}
DeviceManagementBackend::ErrorCode expected_error_;
- URLRequestStatus request_status_;
+ net::URLRequestStatus request_status_;
int http_status_;
std::string response_;
};
@@ -161,37 +161,37 @@ INSTANTIATE_TEST_CASE_P(
testing::Values(
FailedRequestParams(
DeviceManagementBackend::kErrorRequestFailed,
- URLRequestStatus::FAILED,
+ net::URLRequestStatus::FAILED,
200,
PROTO_STRING(kResponseEmpty)),
FailedRequestParams(
DeviceManagementBackend::kErrorHttpStatus,
- URLRequestStatus::SUCCESS,
+ net::URLRequestStatus::SUCCESS,
500,
PROTO_STRING(kResponseEmpty)),
FailedRequestParams(
DeviceManagementBackend::kErrorResponseDecoding,
- URLRequestStatus::SUCCESS,
+ net::URLRequestStatus::SUCCESS,
200,
PROTO_STRING("Not a protobuf.")),
FailedRequestParams(
DeviceManagementBackend::kErrorServiceManagementNotSupported,
- URLRequestStatus::SUCCESS,
+ net::URLRequestStatus::SUCCESS,
200,
PROTO_STRING(kResponseErrorManagementNotSupported)),
FailedRequestParams(
DeviceManagementBackend::kErrorServiceDeviceNotFound,
- URLRequestStatus::SUCCESS,
+ net::URLRequestStatus::SUCCESS,
200,
PROTO_STRING(kResponseErrorDeviceNotFound)),
FailedRequestParams(
DeviceManagementBackend::kErrorServiceManagementTokenInvalid,
- URLRequestStatus::SUCCESS,
+ net::URLRequestStatus::SUCCESS,
200,
PROTO_STRING(kResponseErrorManagementTokenInvalid)),
FailedRequestParams(
DeviceManagementBackend::kErrorServiceActivationPending,
- URLRequestStatus::SUCCESS,
+ net::URLRequestStatus::SUCCESS,
200,
PROTO_STRING(kResponseErrorActivationPending))));
@@ -299,7 +299,7 @@ TEST_F(DeviceManagementServiceTest, RegisterRequest) {
response_wrapper.set_error(em::DeviceManagementResponse::SUCCESS);
response_wrapper.mutable_register_response()->CopyFrom(expected_response);
ASSERT_TRUE(response_wrapper.SerializeToString(&response_data));
- URLRequestStatus status(URLRequestStatus::SUCCESS, 0);
+ net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
fetcher->delegate()->OnURLFetchComplete(fetcher,
GURL(kServiceUrl),
status,
@@ -342,7 +342,7 @@ TEST_F(DeviceManagementServiceTest, UnregisterRequest) {
response_wrapper.set_error(em::DeviceManagementResponse::SUCCESS);
response_wrapper.mutable_unregister_response()->CopyFrom(expected_response);
ASSERT_TRUE(response_wrapper.SerializeToString(&response_data));
- URLRequestStatus status(URLRequestStatus::SUCCESS, 0);
+ net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
fetcher->delegate()->OnURLFetchComplete(fetcher,
GURL(kServiceUrl),
status,
@@ -397,7 +397,7 @@ TEST_F(DeviceManagementServiceTest, PolicyRequest) {
response_wrapper.set_error(em::DeviceManagementResponse::SUCCESS);
response_wrapper.mutable_policy_response()->CopyFrom(expected_response);
ASSERT_TRUE(response_wrapper.SerializeToString(&response_data));
- URLRequestStatus status(URLRequestStatus::SUCCESS, 0);
+ net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
fetcher->delegate()->OnURLFetchComplete(fetcher,
GURL(kServiceUrl),
status,
@@ -473,7 +473,7 @@ TEST_F(DeviceManagementServiceTest, JobQueueing) {
response_wrapper.set_error(em::DeviceManagementResponse::SUCCESS);
response_wrapper.mutable_register_response()->CopyFrom(expected_response);
ASSERT_TRUE(response_wrapper.SerializeToString(&response_data));
- URLRequestStatus status(URLRequestStatus::SUCCESS, 0);
+ net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
fetcher->delegate()->OnURLFetchComplete(fetcher,
GURL(kServiceUrl),
status,
« no previous file with comments | « chrome/browser/policy/device_management_service.cc ('k') | chrome/browser/prerender/prerender_interceptor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698