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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10581012: Move test_url_fetcher_factory.* from content/ to net/url_request (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove export annotations Created 8 years, 6 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
« no previous file with comments | « chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc ('k') | chrome/browser/policy/testing_policy_url_fetcher_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5503d7a2dd2a72649916b5b95b1280f4401f0b93..d5fb096bfe760a0e1ae02eb1203b8d81756ccdb8 100644
--- a/chrome/browser/policy/device_management_service_unittest.cc
+++ b/chrome/browser/policy/device_management_service_unittest.cc
@@ -12,11 +12,11 @@
#include "chrome/browser/policy/device_management_service.h"
#include "chrome/test/base/testing_browser_process.h"
#include "content/public/test/test_browser_thread.h"
-#include "content/public/test/test_url_fetcher_factory.h"
#include "net/base/escape.h"
#include "net/base/load_flags.h"
#include "net/base/net_errors.h"
#include "net/http/http_response_headers.h"
+#include "net/url_request/test_url_fetcher_factory.h"
#include "net/url_request/url_request_status.h"
#include "net/url_request/url_request_test_util.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -118,7 +118,7 @@ class DeviceManagementServiceTestBase : public testing::Test {
return job;
}
- void SendResponse(TestURLFetcher* fetcher,
+ void SendResponse(net::TestURLFetcher* fetcher,
const net::URLRequestStatus request_status,
int http_status,
const std::string& response) {
@@ -132,7 +132,7 @@ class DeviceManagementServiceTestBase : public testing::Test {
MOCK_METHOD2(OnJobDone, void(DeviceManagementStatus,
const em::DeviceManagementResponse&));
- TestURLFetcherFactory factory_;
+ net::TestURLFetcherFactory factory_;
scoped_ptr<DeviceManagementService> service_;
private:
@@ -173,7 +173,7 @@ class DeviceManagementServiceFailedRequestTest
TEST_P(DeviceManagementServiceFailedRequestTest, RegisterRequest) {
EXPECT_CALL(*this, OnJobDone(GetParam().expected_status_, _));
scoped_ptr<DeviceManagementRequestJob> request_job(StartRegistrationJob());
- TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
+ net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
ASSERT_TRUE(fetcher);
SendResponse(fetcher, GetParam().request_status_, GetParam().http_status_,
@@ -183,7 +183,7 @@ TEST_P(DeviceManagementServiceFailedRequestTest, RegisterRequest) {
TEST_P(DeviceManagementServiceFailedRequestTest, UnregisterRequest) {
EXPECT_CALL(*this, OnJobDone(GetParam().expected_status_, _));
scoped_ptr<DeviceManagementRequestJob> request_job(StartUnregistrationJob());
- TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
+ net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
ASSERT_TRUE(fetcher);
SendResponse(fetcher, GetParam().request_status_, GetParam().http_status_,
@@ -193,7 +193,7 @@ TEST_P(DeviceManagementServiceFailedRequestTest, UnregisterRequest) {
TEST_P(DeviceManagementServiceFailedRequestTest, PolicyRequest) {
EXPECT_CALL(*this, OnJobDone(GetParam().expected_status_, _));
scoped_ptr<DeviceManagementRequestJob> request_job(StartPolicyFetchJob());
- TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
+ net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
ASSERT_TRUE(fetcher);
SendResponse(fetcher, GetParam().request_status_, GetParam().http_status_,
@@ -203,7 +203,7 @@ TEST_P(DeviceManagementServiceFailedRequestTest, PolicyRequest) {
TEST_P(DeviceManagementServiceFailedRequestTest, AutoEnrollmentRequest) {
EXPECT_CALL(*this, OnJobDone(GetParam().expected_status_, _));
scoped_ptr<DeviceManagementRequestJob> request_job(StartAutoEnrollmentJob());
- TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
+ net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
ASSERT_TRUE(fetcher);
SendResponse(fetcher, GetParam().request_status_, GetParam().http_status_,
@@ -359,7 +359,7 @@ TEST_F(DeviceManagementServiceTest, RegisterRequest) {
EXPECT_CALL(*this, OnJobDone(DM_STATUS_SUCCESS,
MessageEquals(expected_response)));
scoped_ptr<DeviceManagementRequestJob> request_job(StartRegistrationJob());
- TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
+ net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
ASSERT_TRUE(fetcher);
CheckURLAndQueryParams(fetcher->GetOriginalURL(),
@@ -383,7 +383,7 @@ TEST_F(DeviceManagementServiceTest, UnregisterRequest) {
EXPECT_CALL(*this, OnJobDone(DM_STATUS_SUCCESS,
MessageEquals(expected_response)));
scoped_ptr<DeviceManagementRequestJob> request_job(StartUnregistrationJob());
- TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
+ net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
ASSERT_TRUE(fetcher);
// Check the data the fetcher received.
@@ -412,7 +412,7 @@ TEST_F(DeviceManagementServiceTest, UnregisterRequest) {
TEST_F(DeviceManagementServiceTest, CancelRegisterRequest) {
EXPECT_CALL(*this, OnJobDone(_, _)).Times(0);
scoped_ptr<DeviceManagementRequestJob> request_job(StartRegistrationJob());
- TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
+ net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
ASSERT_TRUE(fetcher);
// There shouldn't be any callbacks.
@@ -422,7 +422,7 @@ TEST_F(DeviceManagementServiceTest, CancelRegisterRequest) {
TEST_F(DeviceManagementServiceTest, CancelUnregisterRequest) {
EXPECT_CALL(*this, OnJobDone(_, _)).Times(0);
scoped_ptr<DeviceManagementRequestJob> request_job(StartUnregistrationJob());
- TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
+ net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
ASSERT_TRUE(fetcher);
// There shouldn't be any callbacks.
@@ -432,7 +432,7 @@ TEST_F(DeviceManagementServiceTest, CancelUnregisterRequest) {
TEST_F(DeviceManagementServiceTest, CancelPolicyRequest) {
EXPECT_CALL(*this, OnJobDone(_, _)).Times(0);
scoped_ptr<DeviceManagementRequestJob> request_job(StartPolicyFetchJob());
- TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
+ net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
ASSERT_TRUE(fetcher);
// There shouldn't be any callbacks.
@@ -451,7 +451,7 @@ TEST_F(DeviceManagementServiceTest, JobQueueing) {
// Make a request. We should not see any fetchers being created.
scoped_ptr<DeviceManagementRequestJob> request_job(StartRegistrationJob());
- TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
+ net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
ASSERT_FALSE(fetcher);
// Now initialize the service. That should start the job.
@@ -470,7 +470,7 @@ TEST_F(DeviceManagementServiceTest, JobQueueing) {
TEST_F(DeviceManagementServiceTest, CancelRequestAfterShutdown) {
EXPECT_CALL(*this, OnJobDone(_, _)).Times(0);
scoped_ptr<DeviceManagementRequestJob> request_job(StartPolicyFetchJob());
- TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
+ net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
ASSERT_TRUE(fetcher);
// Shutdown the service and cancel the job afterwards.
@@ -485,7 +485,7 @@ ACTION_P(ResetPointer, pointer) {
TEST_F(DeviceManagementServiceTest, CancelDuringCallback) {
// Make a request.
scoped_ptr<DeviceManagementRequestJob> request_job(StartRegistrationJob());
- TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
+ net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
ASSERT_TRUE(fetcher);
EXPECT_CALL(*this, OnJobDone(_, _))
@@ -504,7 +504,7 @@ TEST_F(DeviceManagementServiceTest, RetryOnProxyError) {
EXPECT_CALL(*this, OnJobDone(_, _)).Times(0);
scoped_ptr<DeviceManagementRequestJob> request_job(StartRegistrationJob());
- TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
+ net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
ASSERT_TRUE(fetcher);
EXPECT_TRUE((fetcher->GetLoadFlags() & net::LOAD_BYPASS_PROXY) == 0);
const GURL original_url(fetcher->GetOriginalURL());
@@ -528,7 +528,7 @@ TEST_F(DeviceManagementServiceTest, RetryOnBadResponseFromProxy) {
EXPECT_CALL(*this, OnJobDone(_, _)).Times(0);
scoped_ptr<DeviceManagementRequestJob> request_job(StartRegistrationJob());
- TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
+ net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
ASSERT_TRUE(fetcher);
EXPECT_TRUE((fetcher->GetLoadFlags() & net::LOAD_BYPASS_PROXY) == 0);
const GURL original_url(fetcher->GetOriginalURL());
« no previous file with comments | « chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc ('k') | chrome/browser/policy/testing_policy_url_fetcher_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698