Rework the device management backend implementation.

chrome/browser/policy/device_management_backend_impl_browsertest.cc

Index: chrome/browser/policy/device_management_backend_impl_browsertest.cc
diff --git a/chrome/browser/policy/device_management_backend_impl_browsertest.cc b/chrome/browser/policy/device_management_backend_impl_browsertest.cc
index 770317b34a0384cad6886bd6ffff7434bead3296..81dc9c0f5b6fbf73f28ea882c66ed197c18ee86b 100644
--- a/chrome/browser/policy/device_management_backend_impl_browsertest.cc
+++ b/chrome/browser/policy/device_management_backend_impl_browsertest.cc
@@ -5,7 +5,9 @@
 #include "chrome/browser/policy/device_management_backend_impl.h"
 
 #include "base/message_loop.h"
+#include "chrome/browser/browser.h"
 #include "chrome/browser/browser_thread.h"
+#include "chrome/browser/profile.h"

[danno, 2010/11/16 22:02:56]

alphabetize

[Mattias Nissler (ping if slow), 2010/11/19 17:21:53]

Done.

 #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";

[markusheintz_, 2010/11/18 12:40:36]

s/URL/Url/

please do that in the reset of the CL as well.

http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#General_Naming...

[Mattias Nissler (ping if slow), 2010/11/19 17:21:53]

I changed the constant names, but the class names I kept in caps (i.e.
URLQueryParameters) for consistence with the existing code (see URLRequest,
URLFetcher, URLRequestContext etc.)

 
 // Binary representation of successful register response containing a token.
 const char kServiceResponseRegister[] =
@@ -92,24 +95,28 @@ static void QuitMessageLoop() {
 IN_PROC_BROWSER_TEST_F(DeviceManagementBackendImplIntegrationTest,
                        CannedResponses) {
   URLFetcher::enable_interception_for_tests(true);
-  DeviceManagementBackendImpl service(kServiceUrl);
+  DeviceManagementBackendImpl backend(
+      kServiceURL,
+      browser()->profile()->GetRequestContext());
+  scoped_ptr<DeviceManagementBackend> service(
+      DeviceManagementBackendImpl::Get());
 
   {
     CannedResponseInterceptor interceptor(
-        GURL(kServiceUrl), PROTO_STRING(kServiceResponseRegister));
+        GURL(kServiceURL), PROTO_STRING(kServiceResponseRegister));
     DeviceRegisterResponseDelegateMock delegate;
     EXPECT_CALL(delegate, HandleRegisterResponse(_))
         .WillOnce(DoAll(Invoke(this, &DeviceManagementBackendImplIntegrationTest
                                           ::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,19 +125,19 @@ 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();
   }
@@ -138,12 +145,15 @@ IN_PROC_BROWSER_TEST_F(DeviceManagementBackendImplIntegrationTest,
 
 IN_PROC_BROWSER_TEST_F(DeviceManagementBackendImplIntegrationTest,
                        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());
+  DeviceManagementBackendImpl backend(
+      test_server_.GetURL("device_management").spec(),
+      browser()->profile()->GetRequestContext());
+  scoped_ptr<DeviceManagementBackend> service(
+      DeviceManagementBackendImpl::Get());
 
   {
     DeviceRegisterResponseDelegateMock delegate;
@@ -152,7 +162,7 @@ IN_PROC_BROWSER_TEST_F(DeviceManagementBackendImplIntegrationTest,
                                           ::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 +177,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 +187,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();
   }