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

chrome/test/live_sync/many_client_bookmarks_sync_test.cc

 // Copyright (c) 2011 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 "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/test/live_sync/bookmarks_helper.h"
 #include "chrome/test/live_sync/live_sync_test.h"
 
+using bookmarks_helper::AddURL;
+using bookmarks_helper::AllModelsMatch;
+
 class ManyClientBookmarksSyncTest : public LiveSyncTest {
  public:
   ManyClientBookmarksSyncTest() : LiveSyncTest(MANY_CLIENT) {}
   virtual ~ManyClientBookmarksSyncTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ManyClientBookmarksSyncTest);
 };
 
 // TODO(rsimha): Enable once http://crbug.com/69604 is fixed.
 IN_PROC_BROWSER_TEST_F(ManyClientBookmarksSyncTest, DISABLED_Sanity) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(BookmarksHelper::AddURL(
-      0, L"Google URL", GURL("http://www.google.com/")) != NULL);
+  ASSERT_TRUE(AddURL(0, L"Google URL", GURL("http://www.google.com/")) != NULL);
   ASSERT_TRUE(GetClient(0)->AwaitGroupSyncCycleCompletion(clients()));
-  ASSERT_TRUE(BookmarksHelper::AllModelsMatch());
+  ASSERT_TRUE(AllModelsMatch());
 }