Fix log spew for "_comment..." policies.

components/policy/core/common/configuration_policy_provider_test.h

 // 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.
 
 #ifndef COMPONENTS_POLICY_CORE_COMMON_CONFIGURATION_POLICY_PROVIDER_TEST_H_
 #define COMPONENTS_POLICY_CORE_COMMON_CONFIGURATION_POLICY_PROVIDER_TEST_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 17 matching lines @@
 class SequencedTaskRunner;
 class Value;
 }
 
 namespace policy {
 
 class ConfigurationPolicyProvider;
 
 namespace test_keys {
 
-// Key constants for general use.
 extern const char kKeyString[];
 extern const char kKeyBoolean[];
 extern const char kKeyInteger[];
 extern const char kKeyStringList[];
 extern const char kKeyDictionary[];
 
 }  // namespace test_keys
 
 class PolicyTestBase : public testing::Test {
  public:
@@ skipping 35 matching lines @@
 
   // Actions to run at gtest SetUp() time.
   virtual void SetUp() = 0;
 
   // Create a new policy provider.
   virtual ConfigurationPolicyProvider* CreateProvider(
       SchemaRegistry* registry,
       scoped_refptr<base::SequencedTaskRunner> task_runner) = 0;
 
   // Returns the policy level, scope and source set by the policy provider.
-  PolicyLevel policy_level() const { return level_; }
-  PolicyScope policy_scope() const { return scope_; }
-  PolicySource policy_source() const { return source_; }
-
-  // Returns policy keys and matching schema.
-  const char* key_string() const { return key_string_; }
-  const char* key_boolean() const { return key_boolean_; }
-  const char* key_integer() const { return key_integer_; }
-  const char* key_stringlist() const { return key_stringlist_; }
-  const char* key_dictionary() const { return key_dictionary_; }
-  const char* test_schema() const { return test_schema_; }
+  PolicyLevel policy_level() const;
+  PolicyScope policy_scope() const;
+  PolicySource policy_source() const;
 
   // Helpers to configure the environment the policy provider reads from.
   virtual void InstallEmptyPolicy() = 0;
   virtual void InstallStringPolicy(const std::string& policy_name,
                                    const std::string& policy_value) = 0;
   virtual void InstallIntegerPolicy(const std::string& policy_name,
                                     int policy_value) = 0;
   virtual void InstallBooleanPolicy(const std::string& policy_name,
                                     bool policy_value) = 0;
   virtual void InstallStringListPolicy(const std::string& policy_name,
                                        const base::ListValue* policy_value) = 0;
   virtual void InstallDictionaryPolicy(
       const std::string& policy_name,
       const base::DictionaryValue* policy_value) = 0;
 
   // Not every provider supports installing 3rd party policy. Those who do
   // should override this method; the default just makes the test fail.
   virtual void Install3rdPartyPolicy(const base::DictionaryValue* policies);
 
- protected:
-  const char* key_string_;
-  const char* key_boolean_;
-  const char* key_integer_;
-  const char* key_stringlist_;
-  const char* key_dictionary_;
-  const char* test_schema_;
-
  private:
   PolicyLevel level_;
   PolicyScope scope_;
   PolicySource source_;
 
   DISALLOW_COPY_AND_ASSIGN(PolicyProviderTestHarness);
 };
 
 // A factory method for creating a test harness.
 typedef PolicyProviderTestHarness* (*CreatePolicyProviderTestHarness)();
@@ skipping 10 matching lines @@
 
   void SetUp() override;
   void TearDown() override;
 
   // Installs a valid policy and checks whether the provider returns the
   // |expected_value|.
   void CheckValue(const char* policy_name,
                   const base::Value& expected_value,
                   base::Closure install_value);
 
-  std::unique_ptr<PolicyProviderTestHarness> harness_;
+  std::unique_ptr<PolicyProviderTestHarness> test_harness_;
   std::unique_ptr<ConfigurationPolicyProvider> provider_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ConfigurationPolicyProviderTest);
 };
 
 // An extension of ConfigurationPolicyProviderTest that also tests loading of
 // 3rd party policy. Policy provider implementations that support loading of
 // 3rd party policy should also instantiate these tests.
 class Configuration3rdPartyPolicyProviderTest
     : public ConfigurationPolicyProviderTest {
  protected:
   Configuration3rdPartyPolicyProviderTest();
   virtual ~Configuration3rdPartyPolicyProviderTest();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Configuration3rdPartyPolicyProviderTest);
 };
 
 }  // namespace policy
 
 #endif  // COMPONENTS_POLICY_CORE_COMMON_CONFIGURATION_POLICY_PROVIDER_TEST_H_