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

chrome/test/live_sync/sync_errors_test.cc

Index: chrome/test/live_sync/sync_errors_test.cc
diff --git a/chrome/test/live_sync/sync_errors_test.cc b/chrome/test/live_sync/sync_errors_test.cc
index f062cca132d9a0ca8dfb48601c856f9e2553d32d..5d620a174010072ec39b24c66407bf32a21a1fbb 100644
--- a/chrome/test/live_sync/sync_errors_test.cc
+++ b/chrome/test/live_sync/sync_errors_test.cc
@@ -3,32 +3,31 @@
 // found in the LICENSE file.
 
 #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"
 
-#include "chrome/test/live_sync/bookmarks_helper.h"
+using bookmarks_helper::AddFolder;
+using bookmarks_helper::SetTitle;
 
 class SyncErrorTest : public LiveSyncTest{
  public:
-  SyncErrorTest() : LiveSyncTest(SINGLE_CLIENT) {
-  }
-  ~SyncErrorTest() {}
+  SyncErrorTest() : LiveSyncTest(SINGLE_CLIENT) {}
+  virtual ~SyncErrorTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SyncErrorTest);
-
 };
 
 IN_PROC_BROWSER_TEST_F(SyncErrorTest, BirthdayErrorTest) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
-  const BookmarkNode* node1 = BookmarksHelper::AddFolder(0, 0, L"title1");
-  BookmarksHelper::SetTitle(0, node1, L"new_title1");
+  const BookmarkNode* node1 = AddFolder(0, 0, L"title1");
+  SetTitle(0, node1, L"new_title1");
   ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Offline state change."));
   TriggerBirthdayError();
 
   // Now make one more change so we will do another sync.
-  const BookmarkNode* node2 = BookmarksHelper::AddFolder(0, 0, L"title2");
-  BookmarksHelper::SetTitle(0, node2, L"new_title2");
+  const BookmarkNode* node2 = AddFolder(0, 0, L"title2");
+  SetTitle(0, node2, L"new_title2");
   ASSERT_TRUE(GetClient(0)->AwaitSyncDisabled("Birthday error."));
 }