Split Drive test utilities to drive_test_util and gdata_test_util

chrome/browser/chromeos/gdata/drive_test_util.h

Index: chrome/browser/chromeos/gdata/drive_test_util.h
diff --git a/chrome/browser/chromeos/gdata/drive_test_util.h b/chrome/browser/chromeos/gdata/drive_test_util.h
index 7b3807cb14b03f53464ebc414d5e14828043300b..7b4344ea759fa9e4187ff63ea8f57cecf6a2a211 100644
--- a/chrome/browser/chromeos/gdata/drive_test_util.h
+++ b/chrome/browser/chromeos/gdata/drive_test_util.h
@@ -7,6 +7,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/gdata/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/gdata/gdata_test_util.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 
 class FilePath;
@@ -25,15 +26,6 @@ typedef std::vector<DriveEntryProto> DriveEntryProtoVector;
 
 namespace test_util {
 
-// Runs a task posted to the blocking pool, including subsequent tasks posted
-// to the UI message loop and the blocking pool.
-//
-// A task is often posted to the blocking pool with PostTaskAndReply(). In
-// that case, a task is posted back to the UI message loop, which can again
-// post a task to the blocking pool. This function processes these tasks
-// repeatedly.
-void RunBlockingPoolTask();
-
 // This is a bitmask of cache states in DriveCacheEntry. Used only in tests.
 enum TestDriveCacheState {
   TEST_CACHE_STATE_NONE       = 0,
@@ -99,14 +91,6 @@ void CopyResultsFromGetEntryInfoPairCallback(
     scoped_ptr<EntryInfoPairResult>* out_result,
     scoped_ptr<EntryInfoPairResult> result);
 
-// Returns the absolute path for a test file stored under
-// chrome/test/data/chromeos.
-FilePath GetTestFilePath(const std::string& relative_path);
-
-// Loads a test JSON file as a base::Value, from a test file stored under
-// chrome/test/data/chromeos.
-scoped_ptr<base::Value> LoadJSONFile(const std::string& relative_path);
-
 // Loads a test json file as root ("/drive") element from a test file stored
 // under chrome/test/data/chromeos.
 void LoadChangeFeed(const std::string& relative_path,