Remove policy watching from It2MeHost.

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 221 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();
   }
 
+  // TODO(jamiewalch): Update this to use PolicyWatcher::GetDefaultValues()
   const base::DictionaryValue& GetDefaultValues() {
     return *(policy_watcher_->default_values_);
   }
 
   MOCK_METHOD0(PostPolicyWatcherShutdown, void());
 
   static const char* kHostDomain;
   static const char* kClientDomain;
   static const char* kPortRange;
   base::MessageLoop message_loop_;
@@ skipping 41 matching lines @@
   base::DictionaryValue third_party_auth_partial_;
   base::DictionaryValue third_party_auth_cert_empty_;
   base::DictionaryValue remote_assistance_uiaccess_true_;
   base::DictionaryValue remote_assistance_uiaccess_false_;
   base::DictionaryValue deprecated_policies_;
   base::DictionaryValue deprecated_policies_expected_;
   base::DictionaryValue deprecated_and_new_policies_;
   base::DictionaryValue deprecated_and_new_policies_expected_;
   base::DictionaryValue deprecated_empty_strings_;
 
- private:

[rkjnsn, 2017/05/03 21:31:47]

Is this change related? It doesn't look like you use this method in your
GetCurrentPolicies test.

[Jamie, 2017/05/03 23:41:10]

You're right; I was using it in an earlier iteration. Reverted.

   void SetDefaults(base::DictionaryValue& dict) {
     dict.SetBoolean(key::kRemoteAccessHostFirewallTraversal, true);
     dict.SetBoolean(key::kRemoteAccessHostAllowRelayedConnection, true);
     dict.SetString(key::kRemoteAccessHostUdpPortRange, "");
     dict.Set(key::kRemoteAccessHostClientDomainList,
              base::MakeUnique<base::ListValue>());
     dict.Set(key::kRemoteAccessHostDomainList,
              base::MakeUnique<base::ListValue>());
     dict.SetBoolean(key::kRemoteAccessHostMatchUsername, false);
     dict.SetString(key::kRemoteAccessHostTalkGadgetPrefix,
@@ skipping 448 matching lines @@
   StartWatching();
 }
 
 TEST_F(PolicyWatcherTest, DeprecatedEmpty) {
   EXPECT_CALL(mock_policy_callback_,
               OnPolicyUpdatePtr(IsPolicies(&GetDefaultValues())));
   SetPolicies(deprecated_empty_strings_);
   StartWatching();
 }
 
+TEST_F(PolicyWatcherTest, GetCurrentPolicies) {
+  testing::InSequence sequence;
+  EXPECT_CALL(mock_policy_callback_,
+              OnPolicyUpdatePtr(IsPolicies(&nat_true_others_default_)));
+  EXPECT_CALL(mock_policy_callback_,
+              OnPolicyUpdatePtr(IsPolicies(&nat_false_)));
+
+  StartWatching();
+  SetPolicies(nat_false_);
+  std::unique_ptr<base::DictionaryValue> current_policies =
+      policy_watcher_->GetCurrentPolicies();
+  ASSERT_TRUE(*current_policies == nat_false_others_default_);
+}
+
 }  // namespace remoting