Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / policy / cloud / device_management_service_browsertest.cc

diff --git a/src/chrome/browser/policy/cloud/device_management_service_browsertest.cc b/src/chrome/browser/policy/cloud/device_management_service_browsertest.cc
index 1319048..1cf7a58 100644 (file)
--- a/src/chrome/browser/policy/cloud/device_management_service_browsertest.cc
+++ b/src/chrome/browser/policy/cloud/device_management_service_browsertest.cc
@@ -8,12 +8,12 @@
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/policy/cloud/cloud_policy_constants.h"
-#include "chrome/browser/policy/cloud/device_management_service.h"
-#include "chrome/browser/policy/cloud/mock_device_management_service.h"
 #include "chrome/browser/policy/cloud/test_request_interceptor.h"
 #include "chrome/browser/policy/test/local_policy_test_server.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "components/policy/core/common/cloud/cloud_policy_constants.h"
+#include "components/policy/core/common/cloud/device_management_service.h"
+#include "components/policy/core/common/cloud/mock_device_management_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/base/upload_data_stream.h"
@@ -130,7 +130,8 @@ class DeviceManagementServiceIntegrationTest
                   InvokeWithoutArgs(base::MessageLoop::current(),
                                     &base::MessageLoop::Quit)));
     scoped_ptr<DeviceManagementRequestJob> job(
-        service_->CreateJob(DeviceManagementRequestJob::TYPE_REGISTRATION));
+        service_->CreateJob(DeviceManagementRequestJob::TYPE_REGISTRATION,
+                            g_browser_process->system_request_context()));
     job->SetGaiaToken("gaia_auth_token");
     job->SetOAuthToken("oauth_token");
     job->SetClientID("testid");
@@ -144,12 +145,11 @@ class DeviceManagementServiceIntegrationTest
     std::string service_url((this->*(GetParam()))());
     service_.reset(new DeviceManagementService(
         scoped_ptr<DeviceManagementService::Configuration>(
-            new MockDeviceManagementServiceConfiguration(service_url)),
-        g_browser_process->system_request_context()));
+            new MockDeviceManagementServiceConfiguration(service_url))));
     service_->ScheduleInitialization(0);
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() OVERRIDE {
     service_.reset();
     test_server_.reset();
     interceptor_.reset();
@@ -191,7 +191,8 @@ IN_PROC_BROWSER_TEST_P(DeviceManagementServiceIntegrationTest,
                 InvokeWithoutArgs(base::MessageLoop::current(),
                                   &base::MessageLoop::Quit)));
   scoped_ptr<DeviceManagementRequestJob> job(service_->CreateJob(
-      DeviceManagementRequestJob::TYPE_API_AUTH_CODE_FETCH));
+      DeviceManagementRequestJob::TYPE_API_AUTH_CODE_FETCH,
+      g_browser_process->system_request_context()));
   job->SetDMToken(token_);
   job->SetClientID("testid");
   em::DeviceServiceApiAccessRequest* request =
@@ -212,7 +213,8 @@ IN_PROC_BROWSER_TEST_P(DeviceManagementServiceIntegrationTest, PolicyFetch) {
       .WillOnce(InvokeWithoutArgs(base::MessageLoop::current(),
                                   &base::MessageLoop::Quit));
   scoped_ptr<DeviceManagementRequestJob> job(
-      service_->CreateJob(DeviceManagementRequestJob::TYPE_POLICY_FETCH));
+      service_->CreateJob(DeviceManagementRequestJob::TYPE_POLICY_FETCH,
+                          g_browser_process->system_request_context()));
   job->SetDMToken(token_);
   job->SetUserAffiliation(USER_AFFILIATION_NONE);
   job->SetClientID("testid");
@@ -232,7 +234,8 @@ IN_PROC_BROWSER_TEST_P(DeviceManagementServiceIntegrationTest, Unregistration) {
       .WillOnce(InvokeWithoutArgs(base::MessageLoop::current(),
                                   &base::MessageLoop::Quit));
   scoped_ptr<DeviceManagementRequestJob> job(
-      service_->CreateJob(DeviceManagementRequestJob::TYPE_UNREGISTRATION));
+      service_->CreateJob(DeviceManagementRequestJob::TYPE_UNREGISTRATION,
+                          g_browser_process->system_request_context()));
   job->SetDMToken(token_);
   job->SetClientID("testid");
   job->GetRequest()->mutable_unregister_request();
@@ -247,7 +250,8 @@ IN_PROC_BROWSER_TEST_P(DeviceManagementServiceIntegrationTest, AutoEnrollment) {
       .WillOnce(InvokeWithoutArgs(base::MessageLoop::current(),
                                   &base::MessageLoop::Quit));
   scoped_ptr<DeviceManagementRequestJob> job(
-      service_->CreateJob(DeviceManagementRequestJob::TYPE_AUTO_ENROLLMENT));
+      service_->CreateJob(DeviceManagementRequestJob::TYPE_AUTO_ENROLLMENT,
+                          g_browser_process->system_request_context()));
   job->SetClientID("testid");
   job->GetRequest()->mutable_auto_enrollment_request()->set_remainder(0);
   job->GetRequest()->mutable_auto_enrollment_request()->set_modulus(1);