Handle additional feedback from http://codereview.chromium.org/8395038/.

chrome/browser/policy/device_management_service_unittest.cc

 // 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.
 
 #include <ostream>
 #include <vector>
 
 #include "base/message_loop.h"
 #include "base/string_split.h"
 #include "chrome/browser/policy/device_management_backend_impl.h"
@@ skipping 311 matching lines @@
   DeviceRegisterResponseDelegateMock mock;
   em::DeviceRegisterResponse expected_response;
   expected_response.set_device_management_token(kDMToken);
   EXPECT_CALL(mock, HandleRegisterResponse(MessageEquals(expected_response)));
   em::DeviceRegisterRequest request;
   backend_->ProcessRegisterRequest(kGaiaAuthToken, kOAuthToken,
                                    kDeviceId, request, &mock);
   TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
 
-  CheckURLAndQueryParams(fetcher->GetOriginalUrl(),
+  CheckURLAndQueryParams(fetcher->GetOriginalURL(),
                          DeviceManagementBackendImpl::kValueRequestRegister,
                          kDeviceId);
 
   em::DeviceManagementRequest expected_request_wrapper;
   expected_request_wrapper.mutable_register_request()->CopyFrom(request);
   std::string expected_request_data;
   ASSERT_TRUE(expected_request_wrapper.SerializeToString(
       &expected_request_data));
   EXPECT_EQ(expected_request_data, fetcher->upload_data());
 
@@ skipping 13 matching lines @@
 TEST_F(DeviceManagementServiceTest, UnregisterRequest) {
   DeviceUnregisterResponseDelegateMock mock;
   em::DeviceUnregisterResponse expected_response;
   EXPECT_CALL(mock, HandleUnregisterResponse(MessageEquals(expected_response)));
   em::DeviceUnregisterRequest request;
   backend_->ProcessUnregisterRequest(kDMToken, kDeviceId, request, &mock);
   TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
 
   // Check the data the fetcher received.
-  const GURL& request_url(fetcher->GetOriginalUrl());
+  const GURL& request_url(fetcher->GetOriginalURL());
   const GURL service_url(kServiceUrl);
   EXPECT_EQ(service_url.scheme(), request_url.scheme());
   EXPECT_EQ(service_url.host(), request_url.host());
   EXPECT_EQ(service_url.port(), request_url.port());
   EXPECT_EQ(service_url.path(), request_url.path());
 
-  CheckURLAndQueryParams(fetcher->GetOriginalUrl(),
+  CheckURLAndQueryParams(fetcher->GetOriginalURL(),
                          DeviceManagementBackendImpl::kValueRequestUnregister,
                          kDeviceId);
 
   em::DeviceManagementRequest expected_request_wrapper;
   expected_request_wrapper.mutable_unregister_request()->CopyFrom(request);
   std::string expected_request_data;
   ASSERT_TRUE(expected_request_wrapper.SerializeToString(
       &expected_request_data));
   EXPECT_EQ(expected_request_data, fetcher->upload_data());
 
@@ skipping 137 matching lines @@
   DeviceRegisterResponseDelegateMock mock;
   EXPECT_CALL(mock, HandleRegisterResponse(_)).Times(0);
   EXPECT_CALL(mock, OnError(_)).Times(0);
 
   em::DeviceRegisterRequest request;
   backend_->ProcessRegisterRequest(kGaiaAuthToken, kOAuthToken,
                                    kDeviceId, request, &mock);
   TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
   EXPECT_TRUE((fetcher->GetLoadFlags() & net::LOAD_BYPASS_PROXY) == 0);
-  const GURL original_url(fetcher->GetOriginalUrl());
+  const GURL original_url(fetcher->GetOriginalURL());
   const std::string upload_data(fetcher->upload_data());
 
   // Generate a callback with a proxy failure.
   net::URLRequestStatus status(net::URLRequestStatus::FAILED,
                                net::ERR_PROXY_CONNECTION_FAILED);
   fetcher->set_url(GURL(kServiceUrl));
   fetcher->set_status(status);
   fetcher->set_response_code(200);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 
   // Verify that a new URLFetcher was started that bypasses the proxy.
   fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
   EXPECT_TRUE(fetcher->GetLoadFlags() & net::LOAD_BYPASS_PROXY);
-  EXPECT_EQ(original_url, fetcher->GetOriginalUrl());
+  EXPECT_EQ(original_url, fetcher->GetOriginalURL());
   EXPECT_EQ(upload_data, fetcher->upload_data());
 }
 
 TEST_F(DeviceManagementServiceTest, RetryOnBadResponseFromProxy) {
   // Make a request.
   DeviceRegisterResponseDelegateMock mock;
   EXPECT_CALL(mock, HandleRegisterResponse(_)).Times(0);
   EXPECT_CALL(mock, OnError(_)).Times(0);
 
   em::DeviceRegisterRequest request;
   backend_->ProcessRegisterRequest(kGaiaAuthToken, kOAuthToken,
                                    kDeviceId, request, &mock);
   TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
   EXPECT_TRUE((fetcher->GetLoadFlags() & net::LOAD_BYPASS_PROXY) == 0);
-  const GURL original_url(fetcher->GetOriginalUrl());
+  const GURL original_url(fetcher->GetOriginalURL());
   const std::string upload_data(fetcher->upload_data());
   fetcher->set_was_fetched_via_proxy(true);
   scoped_refptr<net::HttpResponseHeaders> headers;
   headers = new net::HttpResponseHeaders(
       "HTTP/1.1 200 OK\0Content-type: bad/type\0\0");
   fetcher->set_response_headers(headers);
 
   // Generate a callback with a valid http response, that was generated by
   // a bad/wrong proxy.
   net::URLRequestStatus status;
   fetcher->set_url(GURL(kServiceUrl));
   fetcher->set_status(status);
   fetcher->set_response_code(200);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 
   // Verify that a new URLFetcher was started that bypasses the proxy.
   fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
   EXPECT_TRUE((fetcher->GetLoadFlags() & net::LOAD_BYPASS_PROXY) != 0);
-  EXPECT_EQ(original_url, fetcher->GetOriginalUrl());
+  EXPECT_EQ(original_url, fetcher->GetOriginalURL());
   EXPECT_EQ(upload_data, fetcher->upload_data());
 }
 
 }  // namespace policy