| Index: chrome/browser/policy/device_management_service_browsertest.cc
|
| diff --git a/chrome/browser/policy/device_management_backend_impl_browsertest.cc b/chrome/browser/policy/device_management_service_browsertest.cc
|
| similarity index 75%
|
| rename from chrome/browser/policy/device_management_backend_impl_browsertest.cc
|
| rename to chrome/browser/policy/device_management_service_browsertest.cc
|
| index 770317b34a0384cad6886bd6ffff7434bead3296..63bbf57ecef312388c325c312cab87f97d14816f 100644
|
| --- a/chrome/browser/policy/device_management_backend_impl_browsertest.cc
|
| +++ b/chrome/browser/policy/device_management_service_browsertest.cc
|
| @@ -2,10 +2,12 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/policy/device_management_backend_impl.h"
|
| +#include "chrome/browser/policy/device_management_service.h"
|
|
|
| #include "base/message_loop.h"
|
| +#include "chrome/browser/browser.h"
|
| #include "chrome/browser/browser_thread.h"
|
| +#include "chrome/browser/profile.h"
|
| #include "chrome/browser/policy/device_management_backend_mock.h"
|
| #include "chrome/test/in_process_browser_test.h"
|
| #include "net/test/test_server.h"
|
| @@ -23,7 +25,8 @@ namespace policy {
|
|
|
| namespace {
|
|
|
| -const char kServiceUrl[] = "http://example.com/service";
|
| +// Dummy service URL for testing with request interception enabled.
|
| +const char kServiceURL[] = "http://example.com/device_management";
|
|
|
| // Binary representation of successful register response containing a token.
|
| const char kServiceResponseRegister[] =
|
| @@ -75,7 +78,7 @@ class CannedResponseInterceptor : public URLRequest::Interceptor {
|
| const std::string response_data_;
|
| };
|
|
|
| -class DeviceManagementBackendImplIntegrationTest : public InProcessBrowserTest {
|
| +class DeviceManagementServiceIntegrationTest : public InProcessBrowserTest {
|
| public:
|
| void CaptureToken(const em::DeviceRegisterResponse& response) {
|
| token_ = response.device_management_token();
|
| @@ -89,27 +92,29 @@ static void QuitMessageLoop() {
|
| MessageLoop::current()->Quit();
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(DeviceManagementBackendImplIntegrationTest,
|
| +IN_PROC_BROWSER_TEST_F(DeviceManagementServiceIntegrationTest,
|
| CannedResponses) {
|
| URLFetcher::enable_interception_for_tests(true);
|
| - DeviceManagementBackendImpl service(kServiceUrl);
|
| + DeviceManagementService backend(kServiceURL);
|
| + backend.Initialize(browser()->profile()->GetRequestContext());
|
| + scoped_ptr<DeviceManagementBackend> service(backend.CreateBackend());
|
|
|
| {
|
| CannedResponseInterceptor interceptor(
|
| - GURL(kServiceUrl), PROTO_STRING(kServiceResponseRegister));
|
| + GURL(kServiceURL), PROTO_STRING(kServiceResponseRegister));
|
| DeviceRegisterResponseDelegateMock delegate;
|
| EXPECT_CALL(delegate, HandleRegisterResponse(_))
|
| - .WillOnce(DoAll(Invoke(this, &DeviceManagementBackendImplIntegrationTest
|
| + .WillOnce(DoAll(Invoke(this, &DeviceManagementServiceIntegrationTest
|
| ::CaptureToken),
|
| InvokeWithoutArgs(QuitMessageLoop)));
|
| em::DeviceRegisterRequest request;
|
| - service.ProcessRegisterRequest("token", "device id", request, &delegate);
|
| + service->ProcessRegisterRequest("token", "device id", request, &delegate);
|
| MessageLoop::current()->Run();
|
| }
|
|
|
| {
|
| CannedResponseInterceptor interceptor(
|
| - GURL(kServiceUrl), PROTO_STRING(kServiceResponsePolicy));
|
| + GURL(kServiceURL), PROTO_STRING(kServiceResponsePolicy));
|
| DevicePolicyResponseDelegateMock delegate;
|
| EXPECT_CALL(delegate, HandlePolicyResponse(_))
|
| .WillOnce(InvokeWithoutArgs(QuitMessageLoop));
|
| @@ -118,41 +123,43 @@ IN_PROC_BROWSER_TEST_F(DeviceManagementBackendImplIntegrationTest,
|
| em::DevicePolicySettingRequest* setting_request =
|
| request.add_setting_request();
|
| setting_request->set_key("policy");
|
| - service.ProcessPolicyRequest(token_, request, &delegate);
|
| + service->ProcessPolicyRequest(token_, request, &delegate);
|
|
|
| MessageLoop::current()->Run();
|
| }
|
|
|
| {
|
| CannedResponseInterceptor interceptor(
|
| - GURL(kServiceUrl), PROTO_STRING(kServiceResponseUnregister));
|
| + GURL(kServiceURL), PROTO_STRING(kServiceResponseUnregister));
|
| DeviceUnregisterResponseDelegateMock delegate;
|
| EXPECT_CALL(delegate, HandleUnregisterResponse(_))
|
| .WillOnce(InvokeWithoutArgs(QuitMessageLoop));
|
| em::DeviceUnregisterRequest request;
|
| - service.ProcessUnregisterRequest(token_, request, &delegate);
|
| + service->ProcessUnregisterRequest(token_, request, &delegate);
|
|
|
| MessageLoop::current()->Run();
|
| }
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(DeviceManagementBackendImplIntegrationTest,
|
| +IN_PROC_BROWSER_TEST_F(DeviceManagementServiceIntegrationTest,
|
| WithTestServer) {
|
| - net::TestServer test_server(
|
| + net::TestServer test_server_(
|
| net::TestServer::TYPE_HTTP,
|
| FilePath(FILE_PATH_LITERAL("chrome/test/data/policy")));
|
| - ASSERT_TRUE(test_server.Start());
|
| - DeviceManagementBackendImpl service(
|
| - test_server.GetURL("device_management").spec());
|
| + ASSERT_TRUE(test_server_.Start());
|
| + DeviceManagementService backend(
|
| + test_server_.GetURL("device_management").spec());
|
| + backend.Initialize(browser()->profile()->GetRequestContext());
|
| + scoped_ptr<DeviceManagementBackend> service(backend.CreateBackend());
|
|
|
| {
|
| DeviceRegisterResponseDelegateMock delegate;
|
| EXPECT_CALL(delegate, HandleRegisterResponse(_))
|
| - .WillOnce(DoAll(Invoke(this, &DeviceManagementBackendImplIntegrationTest
|
| + .WillOnce(DoAll(Invoke(this, &DeviceManagementServiceIntegrationTest
|
| ::CaptureToken),
|
| InvokeWithoutArgs(QuitMessageLoop)));
|
| em::DeviceRegisterRequest request;
|
| - service.ProcessRegisterRequest("token", "device id", request, &delegate);
|
| + service->ProcessRegisterRequest("token", "device id", request, &delegate);
|
| MessageLoop::current()->Run();
|
| }
|
|
|
| @@ -167,7 +174,7 @@ IN_PROC_BROWSER_TEST_F(DeviceManagementBackendImplIntegrationTest,
|
| em::DevicePolicySettingRequest* setting_request =
|
| request.add_setting_request();
|
| setting_request->set_key("policy");
|
| - service.ProcessPolicyRequest(token_, request, &delegate);
|
| + service->ProcessPolicyRequest(token_, request, &delegate);
|
|
|
| MessageLoop::current()->Run();
|
| }
|
| @@ -177,7 +184,7 @@ IN_PROC_BROWSER_TEST_F(DeviceManagementBackendImplIntegrationTest,
|
| EXPECT_CALL(delegate, HandleUnregisterResponse(_))
|
| .WillOnce(InvokeWithoutArgs(QuitMessageLoop));
|
| em::DeviceUnregisterRequest request;
|
| - service.ProcessUnregisterRequest(token_, request, &delegate);
|
| + service->ProcessUnregisterRequest(token_, request, &delegate);
|
|
|
| MessageLoop::current()->Run();
|
| }
|
|
|