Modified PolicyService to register observers by domain only, instead of domain and component.

chrome/browser/policy/policy_service_impl_unittest.cc

 // Copyright (c) 2012 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/policy_service_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ skipping 107 matching lines @@
 
 TEST_F(PolicyServiceTest, LoadsPoliciesBeforeProvidersRefresh) {
   PolicyMap expected;
   expected.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                base::Value::CreateIntegerValue(13));
   EXPECT_TRUE(VerifyPolicies(POLICY_DOMAIN_CHROME, "", expected));
 }
 
 TEST_F(PolicyServiceTest, NotifyObservers) {
   MockPolicyServiceObserver observer;
-  policy_service_->AddObserver(POLICY_DOMAIN_CHROME, "", &observer);
+  policy_service_->AddObserver(POLICY_DOMAIN_CHROME, &observer);
 
   PolicyMap expectedPrevious;
   expectedPrevious.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                        base::Value::CreateIntegerValue(13));
 
   PolicyMap expectedCurrent;
   expectedCurrent.CopyFrom(expectedPrevious);
   expectedCurrent.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                       base::Value::CreateIntegerValue(123));
   policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
@@ skipping 44 matching lines @@
                                         PolicyEquals(&expectedCurrent)));
   provider0_.UpdateChromePolicy(policy0_);
   Mock::VerifyAndClearExpectations(&observer);
 
   // No changes again.
   EXPECT_CALL(observer, OnPolicyUpdated(_, _, _, _)).Times(0);
   provider0_.UpdateChromePolicy(policy0_);
   Mock::VerifyAndClearExpectations(&observer);
   EXPECT_TRUE(VerifyPolicies(POLICY_DOMAIN_CHROME, "", expectedCurrent));
 
-  policy_service_->RemoveObserver(POLICY_DOMAIN_CHROME, "", &observer);
+  policy_service_->RemoveObserver(POLICY_DOMAIN_CHROME, &observer);
 }
 
 TEST_F(PolicyServiceTest, NotifyObserversInMultipleNamespaces) {
   const std::string kExtension0("extension-0");
   const std::string kExtension1("extension-1");
   const std::string kExtension2("extension-2");
   MockPolicyServiceObserver chrome_observer;
-  MockPolicyServiceObserver extension0_observer;
-  MockPolicyServiceObserver extension1_observer;
-  MockPolicyServiceObserver extension2_observer;
-  policy_service_->AddObserver(POLICY_DOMAIN_CHROME, "", &chrome_observer);
-  policy_service_->AddObserver(POLICY_DOMAIN_EXTENSIONS, kExtension0,
-                               &extension0_observer);
-  policy_service_->AddObserver(POLICY_DOMAIN_EXTENSIONS, kExtension1,
-                               &extension1_observer);
-  policy_service_->AddObserver(POLICY_DOMAIN_EXTENSIONS, kExtension2,
-                               &extension2_observer);
+  MockPolicyServiceObserver extension_observer;
+  policy_service_->AddObserver(POLICY_DOMAIN_CHROME, &chrome_observer);
+  policy_service_->AddObserver(POLICY_DOMAIN_EXTENSIONS, &extension_observer);
 
   PolicyMap previous_policy_map;
   previous_policy_map.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                           base::Value::CreateIntegerValue(13));
   PolicyMap policy_map;
   policy_map.CopyFrom(previous_policy_map);
   policy_map.Set("policy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                  base::Value::CreateStringValue("value"));
 
   scoped_ptr<PolicyBundle> bundle(new PolicyBundle());
   // The initial setup includes a policy for chrome that is now changing.
   bundle->Get(POLICY_DOMAIN_CHROME, "").CopyFrom(policy_map);
   bundle->Get(POLICY_DOMAIN_EXTENSIONS, kExtension0).CopyFrom(policy_map);
   bundle->Get(POLICY_DOMAIN_EXTENSIONS, kExtension1).CopyFrom(policy_map);
 
   const PolicyMap kEmptyPolicyMap;
   EXPECT_CALL(chrome_observer,
               OnPolicyUpdated(POLICY_DOMAIN_CHROME, "",
                               PolicyEquals(&previous_policy_map),
                               PolicyEquals(&policy_map)));
-  EXPECT_CALL(extension0_observer,
+  EXPECT_CALL(extension_observer,
               OnPolicyUpdated(POLICY_DOMAIN_EXTENSIONS, kExtension0,
                               PolicyEquals(&kEmptyPolicyMap),
                               PolicyEquals(&policy_map)));
-  EXPECT_CALL(extension1_observer,
+  EXPECT_CALL(extension_observer,
               OnPolicyUpdated(POLICY_DOMAIN_EXTENSIONS, kExtension1,
                               PolicyEquals(&kEmptyPolicyMap),
                               PolicyEquals(&policy_map)));
-  EXPECT_CALL(extension2_observer, OnPolicyUpdated(_, _, _, _)).Times(0);
   provider0_.UpdatePolicy(bundle.Pass());
   Mock::VerifyAndClearExpectations(&chrome_observer);
-  Mock::VerifyAndClearExpectations(&extension0_observer);
-  Mock::VerifyAndClearExpectations(&extension1_observer);
-  Mock::VerifyAndClearExpectations(&extension2_observer);
+  Mock::VerifyAndClearExpectations(&extension_observer);
 
   // Chrome policy stays the same, kExtension0 is gone, kExtension1 changes,
   // and kExtension2 is new.
   previous_policy_map.CopyFrom(policy_map);
   bundle.reset(new PolicyBundle());
   bundle->Get(POLICY_DOMAIN_CHROME, "").CopyFrom(policy_map);
   policy_map.Set("policy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                  base::Value::CreateStringValue("another value"));
   bundle->Get(POLICY_DOMAIN_EXTENSIONS, kExtension1).CopyFrom(policy_map);
   bundle->Get(POLICY_DOMAIN_EXTENSIONS, kExtension2).CopyFrom(policy_map);
 
   EXPECT_CALL(chrome_observer, OnPolicyUpdated(_, _, _, _)).Times(0);
-  EXPECT_CALL(extension0_observer,
+  EXPECT_CALL(extension_observer,
               OnPolicyUpdated(POLICY_DOMAIN_EXTENSIONS, kExtension0,
                               PolicyEquals(&previous_policy_map),
                               PolicyEquals(&kEmptyPolicyMap)));
-  EXPECT_CALL(extension1_observer,
+  EXPECT_CALL(extension_observer,
               OnPolicyUpdated(POLICY_DOMAIN_EXTENSIONS, kExtension1,
                               PolicyEquals(&previous_policy_map),
                               PolicyEquals(&policy_map)));
-  EXPECT_CALL(extension2_observer,
+  EXPECT_CALL(extension_observer,
               OnPolicyUpdated(POLICY_DOMAIN_EXTENSIONS, kExtension2,
                               PolicyEquals(&kEmptyPolicyMap),
                               PolicyEquals(&policy_map)));
   provider0_.UpdatePolicy(bundle.Pass());
   Mock::VerifyAndClearExpectations(&chrome_observer);
-  Mock::VerifyAndClearExpectations(&extension0_observer);
-  Mock::VerifyAndClearExpectations(&extension1_observer);
-  Mock::VerifyAndClearExpectations(&extension2_observer);
+  Mock::VerifyAndClearExpectations(&extension_observer);
 
-  policy_service_->RemoveObserver(POLICY_DOMAIN_CHROME, "", &chrome_observer);
-  policy_service_->RemoveObserver(POLICY_DOMAIN_EXTENSIONS, kExtension0,
-                                  &extension0_observer);
-  policy_service_->RemoveObserver(POLICY_DOMAIN_EXTENSIONS, kExtension1,
-                                  &extension1_observer);
-  policy_service_->RemoveObserver(POLICY_DOMAIN_EXTENSIONS, kExtension2,
-                                  &extension2_observer);
+  policy_service_->RemoveObserver(POLICY_DOMAIN_CHROME, &chrome_observer);
+  policy_service_->RemoveObserver(POLICY_DOMAIN_EXTENSIONS,
+                                  &extension_observer);
 }
 
 TEST_F(PolicyServiceTest, Priorities) {
   PolicyMap expected;
   expected.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                base::Value::CreateIntegerValue(13));
   expected.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                base::Value::CreateIntegerValue(0));
   policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                base::Value::CreateIntegerValue(0));
@@ skipping 176 matching lines @@
   // level/scope combination takes precedence, on every namespace.
   expected.Set(kDiffLevelPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
                base::Value::CreateStringValue("bundle2"));
   EXPECT_TRUE(policy_service_->GetPolicies(POLICY_DOMAIN_CHROME, "")
       .Equals(expected));
   EXPECT_TRUE(policy_service_->GetPolicies(POLICY_DOMAIN_EXTENSIONS, kExtension)
       .Equals(expected));
 }
 
 }  // namespace policy