commit 46eb5f6eabcbde324e059b48031eaa9af11ff236
author Gilad Arnold <garnold@chromium.org> Tue May 20 13:21:25 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu May 22 10:34:27 2014 +0000
tree 2cc0f5960aa55edd11ed1dc63ef0ea085a4d00f5
parent 76a11f6d1dc88db5d152283a224e83ed475ab6a9

PM: CopyVariable renamed PollCopyVariable.

This is in effect always used as a polled variable, so we restrict it to
be such.

BUG=None
TEST=Unit tests.

Change-Id: I5a824e3140e461262f9f4e1f2b0ee14f0856713c
Reviewed-on: https://chromium-review.googlesource.com/200619
Tested-by: Gilad Arnold <garnold@chromium.org>
Reviewed-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Gilad Arnold <garnold@chromium.org>

policy_manager/generic_variables_unittest.cc

diff --git a/policy_manager/generic_variables_unittest.cc b/policy_manager/generic_variables_unittest.cc
index 279c729..370da04 100644
--- a/policy_manager/generic_variables_unittest.cc
+++ b/policy_manager/generic_variables_unittest.cc
@@ -16,13 +16,13 @@
 
 namespace chromeos_policy_manager {
 
-class PmCopyVariableTest : public ::testing::Test {};
+class PmPollCopyVariableTest : public ::testing::Test {};
 
 
-TEST_F(PmCopyVariableTest, SimpleTest) {
+TEST_F(PmPollCopyVariableTest, SimpleTest) {
   // Tests that copies are generated as intended.
   int source = 5;
-  CopyVariable<int> var("var", kVariableModePoll, source);
+  PollCopyVariable<int> var("var", source);
 
   // Generate and validate a copy.
   scoped_ptr<const int> copy_1(var.GetValue(
@@ -40,11 +40,11 @@
   PmTestUtils::ExpectVariableHasValue(42, &var);
 }
 
-TEST_F(PmCopyVariableTest, SetFlagTest) {
+TEST_F(PmPollCopyVariableTest, SetFlagTest) {
   // Tests that the set flag is being referred to as expected.
   int source = 5;
   bool is_set = false;
-  CopyVariable<int> var("var", kVariableModePoll, source, &is_set);
+  PollCopyVariable<int> var("var", source, &is_set);
 
   // Flag marked unset, nothing should be returned.
   PmTestUtils::ExpectVariableNotSet(&var);
@@ -69,12 +69,12 @@
 };
 
 
-TEST_F(PmCopyVariableTest, UseCopyConstructorTest) {
+TEST_F(PmPollCopyVariableTest, UseCopyConstructorTest) {
   // Ensures that CopyVariables indeed uses the copy contructor.
   const CopyConstructorTestClass source;
   ASSERT_FALSE(source.copied_);
 
-  CopyVariable<CopyConstructorTestClass> var("var", kVariableModePoll, source);
+  PollCopyVariable<CopyConstructorTestClass> var("var", source);
   scoped_ptr<const CopyConstructorTestClass> copy(
       var.GetValue(PmTestUtils::DefaultTimeout(), NULL));
   PMTEST_ASSERT_NOT_NULL(copy.get());