Split Drive test utilities to drive_test_util and gdata_test_util

chrome/browser/chromeos/gdata/drive_test_util.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_TEST_UTIL_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_TEST_UTIL_H_
 
 #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;
 
 namespace base {
 class Value;
 }
 
 namespace gdata {
 
 class DriveCacheEntry;
 class DriveEntryProto;
 class DriveFileSystem;
 
 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,
   TEST_CACHE_STATE_PINNED     = 1 << 0,
   TEST_CACHE_STATE_PRESENT    = 1 << 1,
   TEST_CACHE_STATE_DIRTY      = 1 << 2,
   TEST_CACHE_STATE_MOUNTED    = 1 << 3,
   TEST_CACHE_STATE_PERSISTENT = 1 << 4,
 };
 
@@ skipping 45 matching lines @@
     DriveFileError error,
     const FilePath& drive_file_path,
     scoped_ptr<DriveEntryProto> entry_proto);
 
 // Copies |result| to |out_result|. Used to run asynchronous functions
 // that take GetEntryInfoPairCallback from tests.
 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,
                     DriveFileSystem* file_system,
                     int64 start_changestamp,
                     int64 root_feed_changestamp);
 
 }  // namespace test_util
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_TEST_UTIL_H_