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

chrome/test/live_sync/sync_datatype_helper.h

Index: chrome/test/live_sync/sync_datatype_helper.h
diff --git a/chrome/test/live_sync/sync_datatype_helper.h b/chrome/test/live_sync/sync_datatype_helper.h
index 1fccda566afd555fefa8abbcd7f4899357345f6c..ebeed62a3a3f5bc692d4cd7df23dcec3b595049d 100644
--- a/chrome/test/live_sync/sync_datatype_helper.h
+++ b/chrome/test/live_sync/sync_datatype_helper.h
@@ -10,25 +10,17 @@
 
 class LiveSyncTest;
 
-class SyncDatatypeHelper {
- public:
-  // Associates an instance of LiveSyncTest with a SyncDatatypeHelper. Must be
-  // called before any of the methods in the helper subclasses can be used.
-  static void AssociateWithTest(LiveSyncTest* test);
+namespace sync_datatype_helper {
 
-  // Returns |test_| after making sure it is a valid pointer.
-  static LiveSyncTest* test();
+// Associates an instance of LiveSyncTest with sync_datatype_helper. Must be
+// called before any of the methods in the per-datatype helper namespaces can be
+// used.
+void AssociateWithTest(LiveSyncTest* test);
 
- protected:
-  SyncDatatypeHelper();
-  virtual ~SyncDatatypeHelper();
-
- private:
-  // The LiveSyncTest instance associated with this helper object.
-  static LiveSyncTest* test_;
-
-  DISALLOW_COPY_AND_ASSIGN(SyncDatatypeHelper);
-};
+// Returns a pointer to the instance of LiveSyncTest associated with the
+// per-datatype helpers after making sure it is valid.
+LiveSyncTest* test();
 
+}  // namespace sync_datatype_helper
 
 #endif  // CHROME_TEST_LIVE_SYNC_SYNC_DATATYPE_HELPER_H_