Rework the device management backend implementation.

chrome/browser/policy/device_management_backend_impl_browsertest.cc

 // Copyright (c) 2010 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 "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"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_job.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::_;
 using testing::DoAll;
 using testing::Invoke;
 using testing::InvokeWithoutArgs;
 
 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[] =
     "\x08\x00\x1a\x22\x0a\x20\x64\x64\x32\x63\x38\x63\x33\x65\x64\x61"
     "\x63\x63\x34\x61\x33\x32\x38\x31\x66\x33\x38\x62\x36\x35\x31\x31"
     "\x36\x64\x61\x62\x66\x63";
 // Contains a single policy setting, namely HomepageIsNewTabPage: false.
 const char kServiceResponsePolicy[] =
     "\x08\x00\x2a\x2a\x0a\x28\x0a\x06\x70\x6f\x6c\x69\x63\x79\x12\x1e"
     "\x0a\x1c\x0a\x14\x48\x6f\x6d\x65\x70\x61\x67\x65\x49\x73\x4e\x65"
@@ skipping 48 matching lines @@
   std::string token_;
 };
 
 static void QuitMessageLoop() {
   MessageLoop::current()->Quit();
 }
 
 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));
     em::DevicePolicyRequest request;
     request.set_policy_scope("chrome");
     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,
                        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;
     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();
   }
 
   {
     em::DevicePolicyResponse expected_response;
 
     DevicePolicyResponseDelegateMock delegate;
     EXPECT_CALL(delegate, HandlePolicyResponse(_))
         .WillOnce(InvokeWithoutArgs(QuitMessageLoop));
     em::DevicePolicyRequest request;
     request.set_policy_scope("chrome");
     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();
   }
 
   {
     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();
   }
 }
 
 }  // namespace policy