Add a method to read the Omaha experiment_labels value.

chrome/installer/util/google_update_settings_unittest.cc

Index: chrome/installer/util/google_update_settings_unittest.cc
diff --git a/chrome/installer/util/google_update_settings_unittest.cc b/chrome/installer/util/google_update_settings_unittest.cc
index 4e1fba28e01da40d4eee01de780b0ea92938fc30..a4b30afb7e7ae933e24945a8372369fe8652bfeb 100644
--- a/chrome/installer/util/google_update_settings_unittest.cc
+++ b/chrome/installer/util/google_update_settings_unittest.cc
@@ -126,29 +126,17 @@ class GoogleUpdateSettingsTest : public testing::Test {
         install == SYSTEM_INSTALL, kTestExperimentLabel));
 
     // Validate that something is written. Only worry about the label itself.
-    RegKey key;
     std::wstring value;
-    HKEY root = install == SYSTEM_INSTALL ?
-        HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
-    string16 state_key = install == SYSTEM_INSTALL ?
-        chrome->GetStateMediumKey() : chrome->GetStateKey();
-
-    EXPECT_EQ(ERROR_SUCCESS,
-              key.Open(root, state_key.c_str(), KEY_QUERY_VALUE));
-    EXPECT_EQ(ERROR_SUCCESS,
-        key.ReadValue(google_update::kExperimentLabels, &value));
+    EXPECT_TRUE(GoogleUpdateSettings::ReadExperimentLabels(

[grt (UTC plus 2), 2013/01/09 18:49:51]

this tests that Set/Read round-trips properly, but no longer tests that they
write to the expected registry location.  how about leaving the previous
validation check in place?

[SteveT, 2013/01/09 19:36:10]

Makes sense, assuming we trust the validation code, which is sort of a repeat of
ReadExperimentsLabels, to some extent. :)

+        install == SYSTEM_INSTALL, &value));
     EXPECT_EQ(kTestExperimentLabel, value);
-    key.Close();
 
     // Now that the label is set, test the delete functionality. An empty label
     // should result in deleting the value.
     EXPECT_TRUE(GoogleUpdateSettings::SetExperimentLabels(
         install == SYSTEM_INSTALL, string16()));
-    EXPECT_EQ(ERROR_SUCCESS,
-              key.Open(root, state_key.c_str(), KEY_QUERY_VALUE));
-    EXPECT_EQ(ERROR_FILE_NOT_FOUND,
-        key.ReadValue(google_update::kExperimentLabels, &value));
-    key.Close();
+    EXPECT_FALSE(GoogleUpdateSettings::ReadExperimentLabels(
+        install == SYSTEM_INSTALL, &value));
 #else
     EXPECT_FALSE(chrome->ShouldSetExperimentLabels());

[grt (UTC plus 2), 2013/01/09 18:49:51]

add an expectation that ReadExperimentLables returns false here?

[SteveT, 2013/01/09 19:36:10]

Done.

 #endif  // GOOGLE_CHROME_BUILD