Index: chrome/browser/chromeos/drive/drive_test_util.h |
diff --git a/chrome/browser/chromeos/drive/drive_test_util.h b/chrome/browser/chromeos/drive/drive_test_util.h |
index 7fc616b1892938377e4b7f1823a5ce27ba22a49b..fedd04503872fe4f80e78af488f97c06b5ade421 100644 |
--- a/chrome/browser/chromeos/drive/drive_test_util.h |
+++ b/chrome/browser/chromeos/drive/drive_test_util.h |
@@ -10,9 +10,8 @@ |
#include "chrome/browser/google_apis/gdata_errorcode.h" |
#include "chrome/browser/google_apis/test_util.h" |
-class FilePath; |
- |
namespace base { |
+class FilePath; |
class Value; |
} |
@@ -51,9 +50,9 @@ void CopyErrorCodeFromFileOperationCallback(DriveFileError* output, |
// Copies |error| and |moved_file_path| to |out_error| and |out_file_path|. |
// Used to run asynchronous functions that take FileMoveCallback from tests. |
void CopyResultsFromFileMoveCallback(DriveFileError* out_error, |
- FilePath* out_file_path, |
+ base::FilePath* out_file_path, |
DriveFileError error, |
- const FilePath& moved_file_path); |
+ const base::FilePath& moved_file_path); |
// Copies |error| and |entry_proto| to |out_error| and |out_entry_proto| |
// respectively. Used to run asynchronous functions that take |
@@ -85,14 +84,14 @@ void CopyResultsFromReadDirectoryByPathCallback( |
// Copies |error|, |drive_file_path|, and |entry_proto| to |out_error|, |
// |out_drive_file_path|, and |out_entry_proto| respectively. Used to run |
-// asynchronous functions that take GetEntryInfoWithFilePathCallback from |
+// asynchronous functions that take GetEntryInfoWithbase::FilePathCallback from |
// tests. |
void CopyResultsFromGetEntryInfoWithFilePathCallback( |
DriveFileError* out_error, |
- FilePath* out_drive_file_path, |
+ base::FilePath* out_drive_file_path, |
scoped_ptr<DriveEntryProto>* out_entry_proto, |
DriveFileError error, |
- const FilePath& drive_file_path, |
+ const base::FilePath& drive_file_path, |
scoped_ptr<DriveEntryProto> entry_proto); |
// Copies |result| to |out_result|. Used to run asynchronous functions |
@@ -108,10 +107,11 @@ void CopyResultFromInitializeCacheCallback(bool* out_success, |
// Copies results from DriveCache methods. Used to run asynchronous functions |
// that take GetFileFromCacheCallback from tests. |
-void CopyResultsFromGetFileFromCacheCallback(DriveFileError* out_error, |
- FilePath* out_cache_file_path, |
- DriveFileError error, |
- const FilePath& cache_file_path); |
+void CopyResultsFromGetFileFromCacheCallback( |
+ DriveFileError* out_error, |
+ base::FilePath* out_cache_file_path, |
+ DriveFileError error, |
+ const base::FilePath& cache_file_path); |
// Copies results from DriveCache methods. Used to run asynchronous functions |
// that take GetCacheEntryCallback from tests. |
@@ -123,10 +123,10 @@ void CopyResultsFromGetCacheEntryCallback(bool* out_success, |
// Copies results from DriveFileSystem methods. Used to run asynchronous |
// functions that take GetFileCallback from tests. |
void CopyResultsFromGetFileCallback(DriveFileError* out_error, |
- FilePath* out_file_path, |
+ base::FilePath* out_file_path, |
DriveFileType* out_file_type, |
DriveFileError error, |
- const FilePath& file_path, |
+ const base::FilePath& file_path, |
const std::string& mime_type, |
DriveFileType file_type); |
@@ -143,9 +143,9 @@ void CopyResultsFromGetAvailableSpaceCallback(DriveFileError* out_error, |
// of the current thread. Used to run asynchronous function that take |
// OpenFileCallback. |
void CopyResultsFromOpenFileCallbackAndQuit(DriveFileError* out_error, |
- FilePath* out_file_path, |
+ base::FilePath* out_file_path, |
DriveFileError error, |
- const FilePath& file_path); |
+ const base::FilePath& file_path); |
// Copies the results from DriveFileSystem methods and stops the message loop |
// of the current thread. Used to run asynchronous function that take |