Refactor PolicyWatcher to allow mocking

remoting/host/policy_watcher_unittest.cc

 // Copyright 2015 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 "remoting/host/policy_watcher.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 172 matching lines @@
     // Simulate a policy file/registry/preference update.
     policy_loader_->SetPolicies(policy_bundle);
     policy_loader_->PostReloadOnBackgroundThread(true /* force reload asap */);
     base::RunLoop().RunUntilIdle();
   }
 
   const policy::Schema* GetPolicySchema() {
     return policy_watcher_->GetPolicySchema();
   }
 
-  const base::DictionaryValue& GetDefaultValues() {
-    return *(policy_watcher_->default_values_);
+  const base::DictionaryValue* GetDefaultValues() {
+    return policy_watcher_->GetDefaultValues();
   }
 
   MOCK_METHOD0(PostPolicyWatcherShutdown, void());
 
   static const char* kHostDomain;
   static const char* kPortRange;
   base::MessageLoop message_loop_;
   MockPolicyCallback mock_policy_callback_;
 
   // |policy_loader_| is owned by |policy_watcher_|. PolicyWatcherTest retains
@@ skipping 52 matching lines @@
                    kDefaultHostTalkGadgetPrefix);
     dict.SetBoolean(key::kRemoteAccessHostRequireCurtain, false);
     dict.SetString(key::kRemoteAccessHostTokenUrl, "");
     dict.SetString(key::kRemoteAccessHostTokenValidationUrl, "");
     dict.SetString(key::kRemoteAccessHostTokenValidationCertificateIssuer, "");
     dict.SetBoolean(key::kRemoteAccessHostAllowClientPairing, true);
     dict.SetBoolean(key::kRemoteAccessHostAllowGnubbyAuth, true);
     dict.SetBoolean(key::kRemoteAccessHostAllowUiAccessForRemoteAssistance,
                     false);
 
-    ASSERT_THAT(&dict, IsPolicies(&GetDefaultValues()))
+    ASSERT_THAT(&dict, IsPolicies(GetDefaultValues()))
         << "Sanity check that defaults expected by the test code "
         << "match what is stored in PolicyWatcher::default_values_";
   }
 };
 
 const char* PolicyWatcherTest::kHostDomain = "google.com";
 const char* PolicyWatcherTest::kPortRange = "12400-12409";
 
 TEST_F(PolicyWatcherTest, None) {
   EXPECT_CALL(mock_policy_callback_,
@@ skipping 351 matching lines @@
 }
 
 TEST_F(PolicyWatcherTest, PolicySchemaAndPolicyWatcherShouldBeInSync) {
   // This test verifies that
   // 1) policy schema (generated out of policy_templates.json)
   // and
   // 2) PolicyWatcher's code (i.e. contents of the |default_values_| field)
   // are kept in-sync.
 
   std::map<std::string, base::Value::Type> expected_schema;
-  for (base::DictionaryValue::Iterator i(GetDefaultValues()); !i.IsAtEnd();
+  for (base::DictionaryValue::Iterator i(*GetDefaultValues()); !i.IsAtEnd();
        i.Advance()) {
     expected_schema[i.key()] = i.value().GetType();
   }
 #if defined(OS_WIN)
   // RemoteAccessHostMatchUsername is marked in policy_templates.json as not
   // supported on Windows and therefore is (by design) excluded from the schema.
   expected_schema.erase(key::kRemoteAccessHostMatchUsername);
 #else  // !defined(OS_WIN)
   // RemoteAssistanceHostAllowUiAccess does not exist on non-Windows platforms.
   expected_schema.erase(key::kRemoteAccessHostAllowUiAccessForRemoteAssistance);
@@ skipping 28 matching lines @@
 
   // And check one, random "boolean" policy to see if the type propagated
   // correctly from policy_templates.json file.
   const policy::Schema boolean_schema =
       schema->GetKnownProperty("RemoteAccessHostRequireCurtain");
   EXPECT_TRUE(boolean_schema.valid());
   EXPECT_EQ(boolean_schema.type(), base::Value::Type::BOOLEAN);
 }
 
 }  // namespace remoting