Device management constants cleanup

chrome/browser/policy/device_management_service_unittest.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 <vector>
+
 #include "base/message_loop.h"
 #include "base/string_split.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/policy/device_management_backend_impl.h"
 #include "chrome/browser/policy/device_management_backend_mock.h"
 #include "chrome/browser/policy/device_management_service.h"
+#include "chrome/browser/policy/proto/device_management_constants.h"
 #include "chrome/common/net/test_url_fetcher_factory.h"
 #include "chrome/test/test_url_request_context_getter.h"
 #include "net/base/escape.h"
 #include "net/url_request/url_request_status.h"
 #include "net/url_request/url_request_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::_;
 
@@ skipping 108 matching lines @@
                                           GetParam().request_status_,
                                           GetParam().http_status_,
                                           ResponseCookies(),
                                           GetParam().response_);
 }
 
 TEST_P(DeviceManagementServiceFailedRequestTest, PolicyRequest) {
   DevicePolicyResponseDelegateMock mock;
   EXPECT_CALL(mock, OnError(GetParam().expected_error_));
   em::DevicePolicyRequest request;
-  request.set_policy_scope("Chrome");
+  request.set_policy_scope(kChromePolicyScope);
   em::DevicePolicySettingRequest* setting_request =
       request.add_setting_request();
-  setting_request->set_key("policy");
+  setting_request->set_key(kChromeDevicePolicySettingKey);
   backend_->ProcessPolicyRequest(kDMToken, kDeviceId, request, &mock);
   TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
 
   fetcher->delegate()->OnURLFetchComplete(fetcher,
                                           GURL(kServiceUrl),
                                           GetParam().request_status_,
                                           GetParam().http_status_,
                                           ResponseCookies(),
                                           GetParam().response_);
@@ skipping 192 matching lines @@
                                           status,
                                           200,
                                           ResponseCookies(),
                                           response_data);
 }
 
 TEST_F(DeviceManagementServiceTest, PolicyRequest) {
   DevicePolicyResponseDelegateMock mock;
   em::DevicePolicyResponse expected_response;
   em::DevicePolicySetting* policy_setting = expected_response.add_setting();
-  policy_setting->set_policy_key("chrome-policy");
+  policy_setting->set_policy_key(kChromeDevicePolicySettingKey);
   policy_setting->set_watermark("fresh");
   em::GenericSetting* policy_value = policy_setting->mutable_policy_value();
   em::GenericNamedValue* named_value = policy_value->add_named_value();
   named_value->set_name("HomepageLocation");
   named_value->mutable_value()->set_value_type(
       em::GenericValue::VALUE_TYPE_STRING);
   named_value->mutable_value()->set_string_value("http://www.chromium.org");
   named_value = policy_value->add_named_value();
   named_value->set_name("HomepageIsNewTabPage");
   named_value->mutable_value()->set_value_type(
       em::GenericValue::VALUE_TYPE_BOOL);
   named_value->mutable_value()->set_bool_value(false);
   EXPECT_CALL(mock, HandlePolicyResponse(MessageEquals(expected_response)));
 
   em::DevicePolicyRequest request;
-  request.set_policy_scope("chromeos/device");
+  request.set_policy_scope(kChromePolicyScope);
   em::DevicePolicySettingRequest* setting_request =
       request.add_setting_request();
-  setting_request->set_key("policy");
+  setting_request->set_key(kChromeDevicePolicySettingKey);
   setting_request->set_watermark("stale");
   backend_->ProcessPolicyRequest(kDMToken, kDeviceId, request, &mock);
   TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
 
   CheckURLAndQueryParams(fetcher->original_url(),
                          DeviceManagementBackendImpl::kValueRequestPolicy,
                          kDeviceId);
 
   em::DeviceManagementRequest expected_request_wrapper;
@@ skipping 39 matching lines @@
   ASSERT_TRUE(fetcher);
 
   // There shouldn't be any callbacks.
   backend_.reset();
 }
 
 TEST_F(DeviceManagementServiceTest, CancelPolicyRequest) {
   DevicePolicyResponseDelegateMock mock;
   EXPECT_CALL(mock, HandlePolicyResponse(_)).Times(0);
   em::DevicePolicyRequest request;
-  request.set_policy_scope("chromium");
+  request.set_policy_scope(kChromePolicyScope);
   em::DevicePolicySettingRequest* setting_request =
       request.add_setting_request();
-  setting_request->set_key("policy");
+  setting_request->set_key(kChromeDevicePolicySettingKey);
   setting_request->set_watermark("stale");
   backend_->ProcessPolicyRequest(kDMToken, kDeviceId, request, &mock);
   TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
 
   // There shouldn't be any callbacks.
   backend_.reset();
 }
 
 TEST_F(DeviceManagementServiceTest, JobQueueing) {
@@ skipping 25 matching lines @@
   URLRequestStatus status(URLRequestStatus::SUCCESS, 0);
   fetcher->delegate()->OnURLFetchComplete(fetcher,
                                           GURL(kServiceUrl),
                                           status,
                                           200,
                                           ResponseCookies(),
                                           response_data);
 }
 
 }  // namespace policy