Removed policy::PolicyNamespaceKey.

chrome/browser/policy/profile_policy_connector_unittest.cc

 // Copyright 2014 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/profile_policy_connector.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "chrome/test/base/testing_browser_process.h"
@@ skipping 23 matching lines @@
 
   void SetUp() override {
     // This must be set up before the TestingBrowserProcess is created.
     BrowserPolicyConnector::SetPolicyProviderForTesting(&mock_provider_);
 
     EXPECT_CALL(mock_provider_, IsInitializationComplete(_))
         .WillRepeatedly(Return(true));
 
     cloud_policy_store_.NotifyStoreLoaded();
     cloud_policy_manager_.reset(
-        new CloudPolicyManager(PolicyNamespaceKey("", ""),
+        new CloudPolicyManager(std::string(),
+                               std::string(),
                                &cloud_policy_store_,
                                loop_.message_loop_proxy(),
                                loop_.message_loop_proxy(),
                                loop_.message_loop_proxy()));
   }
 
   void TearDown() override {
-    TestingBrowserProcess::GetGlobal()->SetBrowserPolicyConnector(NULL);
+    TestingBrowserProcess::GetGlobal()->SetBrowserPolicyConnector(nullptr);
     cloud_policy_manager_->Shutdown();
   }
 
   base::MessageLoop loop_;
   SchemaRegistry schema_registry_;
   MockConfigurationPolicyProvider mock_provider_;
   MockCloudPolicyStore cloud_policy_store_;
   scoped_ptr<CloudPolicyManager> cloud_policy_manager_;
 };
 
 TEST_F(ProfilePolicyConnectorTest, IsPolicyFromCloudPolicy) {
   ProfilePolicyConnector connector;
   connector.Init(false,
 #if defined(OS_CHROMEOS)
-                 NULL,
+                 nullptr,
 #endif
                  &schema_registry_,
                  cloud_policy_manager_.get());
 
   // No policy is set initially.
   EXPECT_FALSE(
       connector.IsPolicyFromCloudPolicy(autofill::prefs::kAutofillEnabled));
-  PolicyNamespace chrome_ns(POLICY_DOMAIN_CHROME, "");
+  PolicyNamespace chrome_ns(POLICY_DOMAIN_CHROME, std::string());
   EXPECT_FALSE(connector.policy_service()->GetPolicies(chrome_ns).GetValue(
       key::kAutoFillEnabled));
 
   // Set the policy at the cloud provider.
   cloud_policy_store_.policy_map_.Set(key::kAutoFillEnabled,
                                       POLICY_LEVEL_MANDATORY,
                                       POLICY_SCOPE_USER,
                                       new base::FundamentalValue(false),
-                                      NULL);
+                                      nullptr);
   cloud_policy_store_.NotifyStoreLoaded();
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(connector.IsPolicyFromCloudPolicy(key::kAutoFillEnabled));
   const base::Value* value =
       connector.policy_service()->GetPolicies(chrome_ns).GetValue(
           key::kAutoFillEnabled);
   ASSERT_TRUE(value);
   EXPECT_TRUE(base::FundamentalValue(false).Equals(value));
 
   // Now test with a higher-priority provider also setting the policy.
   PolicyMap map;
   map.Set(key::kAutoFillEnabled,
           POLICY_LEVEL_MANDATORY,
           POLICY_SCOPE_USER,
           new base::FundamentalValue(true),
-          NULL);
+          nullptr);
   mock_provider_.UpdateChromePolicy(map);
   EXPECT_FALSE(connector.IsPolicyFromCloudPolicy(key::kAutoFillEnabled));
   value = connector.policy_service()->GetPolicies(chrome_ns).GetValue(
       key::kAutoFillEnabled);
   ASSERT_TRUE(value);
   EXPECT_TRUE(base::FundamentalValue(true).Equals(value));
 
   // Cleanup.
   connector.Shutdown();
 }
 
 }  // namespace policy