| Index: chrome/browser/policy/device_management_service_browsertest.cc
|
| diff --git a/chrome/browser/policy/device_management_service_browsertest.cc b/chrome/browser/policy/device_management_service_browsertest.cc
|
| index 1782319822f609b9ee2d4aa823346dbb79f65ccb..9dc8775692aa6f052c345096f89d6adc675fe548 100644
|
| --- a/chrome/browser/policy/device_management_service_browsertest.cc
|
| +++ b/chrome/browser/policy/device_management_service_browsertest.cc
|
| @@ -7,11 +7,11 @@
|
| #include "base/stl_util.h"
|
| #include "chrome/browser/policy/cloud_policy_constants.h"
|
| #include "chrome/browser/policy/device_management_service.h"
|
| +#include "chrome/browser/policy/test/local_policy_test_server.h"
|
| #include "chrome/test/base/in_process_browser_test.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "net/base/upload_bytes_element_reader.h"
|
| #include "net/base/upload_data_stream.h"
|
| -#include "net/test/test_server.h"
|
| #include "net/url_request/url_fetcher.h"
|
| #include "net/url_request/url_request.h"
|
| #include "net/url_request/url_request_filter.h"
|
| @@ -138,7 +138,7 @@ class DeviceManagementServiceIntegrationTest
|
|
|
| std::string InitTestServer() {
|
| StartTestServer();
|
| - return test_server_->GetURL("device_management").spec();
|
| + return test_server_->GetServiceURL().spec();
|
| }
|
|
|
| protected:
|
| @@ -174,10 +174,7 @@ class DeviceManagementServiceIntegrationTest
|
|
|
| void StartTestServer() {
|
| test_server_.reset(
|
| - new net::TestServer(
|
| - net::TestServer::TYPE_HTTP,
|
| - net::TestServer::kLocalhost,
|
| - base::FilePath(FILE_PATH_LITERAL("chrome/test/data/policy"))));
|
| + new LocalPolicyTestServer("device_management_service_browsertest"));
|
| ASSERT_TRUE(test_server_->Start());
|
| }
|
|
|
| @@ -188,7 +185,7 @@ class DeviceManagementServiceIntegrationTest
|
|
|
| std::string token_;
|
| scoped_ptr<DeviceManagementService> service_;
|
| - scoped_ptr<net::TestServer> test_server_;
|
| + scoped_ptr<LocalPolicyTestServer> test_server_;
|
| scoped_ptr<CannedResponseInterceptor> interceptor_;
|
| };
|
|
|
|
|