Removed policy::PolicyNamespaceKey.

chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc

 // Copyright 2013 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 <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 193 matching lines @@
   // Fake policy values which are alternated to cause the store to report a
   // changed policy.
   const char* policy_value_a_;
   const char* policy_value_b_;
 
   // The currently used policy value.
   const char* policy_value_cur_;
 };
 
 CloudPolicyInvalidatorTest::CloudPolicyInvalidatorTest()
-    : core_(PolicyNamespaceKey(dm_protocol::kChromeUserPolicyType,
-                               std::string()),
+    : core_(dm_protocol::kChromeUserPolicyType,
+            std::string(),
             &store_,
             loop_.message_loop_proxy()),
-      client_(NULL),
+      client_(nullptr),
       task_runner_(new base::TestSimpleTaskRunner()),
       clock_(new base::SimpleTestClock()),
       object_id_a_(135, "asdf"),
       object_id_b_(246, "zxcv"),
       policy_value_a_("asdf"),
       policy_value_b_("zxcv"),
       policy_value_cur_(policy_value_a_) {
   clock_->SetNow(
       base::Time::UnixEpoch() + base::TimeDelta::FromSeconds(987654321));
 }
@@ skipping 38 matching lines @@
   client_ = new MockCloudPolicyClient();
   client_->SetDMToken("dm");
   core_.Connect(scoped_ptr<CloudPolicyClient>(client_));
 }
 
 void CloudPolicyInvalidatorTest::StartRefreshScheduler() {
   core_.StartRefreshScheduler();
 }
 
 void CloudPolicyInvalidatorTest::DisconnectCore() {
-  client_ = NULL;
+  client_ = nullptr;
   core_.Disconnect();
 }
 
 void CloudPolicyInvalidatorTest::StorePolicy(
     PolicyObject object,
     int64 invalidation_version,
     bool policy_changed,
     const base::Time& time) {
   em::PolicyData* data = new em::PolicyData();
   if (object != POLICY_OBJECT_NONE) {
@@ skipping 813 matching lines @@
     CloudPolicyInvalidatorUserTypedTest,
     testing::Values(em::DeviceRegisterRequest::IOS_BROWSER));
 #else
 INSTANTIATE_TEST_CASE_P(
     CloudPolicyInvalidatorUserTypedTestInstance,
     CloudPolicyInvalidatorUserTypedTest,
     testing::Values(em::DeviceRegisterRequest::BROWSER));
 #endif
 
 }  // namespace policy