Allow sync integration tests to operate on multiple datatypes: Typed Urls

chrome/test/live_sync/many_client_preferences_sync_test.cc

Index: chrome/test/live_sync/many_client_preferences_sync_test.cc
diff --git a/chrome/test/live_sync/many_client_preferences_sync_test.cc b/chrome/test/live_sync/many_client_preferences_sync_test.cc
index bcc0037e510ff5ba00edc140cff57593be120f41..74b7818340ee24ebd60bd33924d8dee5f1d1a3f2 100644
--- a/chrome/test/live_sync/many_client_preferences_sync_test.cc
+++ b/chrome/test/live_sync/many_client_preferences_sync_test.cc
@@ -7,6 +7,9 @@
 #include "chrome/test/live_sync/live_sync_test.h"
 #include "chrome/test/live_sync/preferences_helper.h"
 
+using preferences_helper::BooleanPrefMatches;
+using preferences_helper::ChangeBooleanPref;
+
 class ManyClientPreferencesSyncTest : public LiveSyncTest {
  public:
   ManyClientPreferencesSyncTest() : LiveSyncTest(MANY_CLIENT) {}
@@ -19,10 +22,8 @@ class ManyClientPreferencesSyncTest : public LiveSyncTest {
 // TODO(rsimha): Enable once http://crbug.com/69604 is fixed.
 IN_PROC_BROWSER_TEST_F(ManyClientPreferencesSyncTest, DISABLED_Sanity) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(PreferencesHelper::BooleanPrefMatches(
-      prefs::kHomePageIsNewTabPage));
-  PreferencesHelper::ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);
+  ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));
+  ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);
   ASSERT_TRUE(GetClient(0)->AwaitGroupSyncCycleCompletion(clients()));
-  ASSERT_TRUE(PreferencesHelper::BooleanPrefMatches(
-      prefs::kHomePageIsNewTabPage));
+  ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));
 }