| Index: chrome/browser/google_apis/drive_uploader_unittest.cc
|
| diff --git a/chrome/browser/google_apis/drive_uploader_unittest.cc b/chrome/browser/google_apis/drive_uploader_unittest.cc
|
| index 2737c4c3746ce090361201f7cb36a4f0cb887f67..d9ef196b05bd2fbbff61c838d868ae15efae7fa7 100644
|
| --- a/chrome/browser/google_apis/drive_uploader_unittest.cc
|
| +++ b/chrome/browser/google_apis/drive_uploader_unittest.cc
|
| @@ -68,7 +68,7 @@ class MockDriveServiceWithUploadExpectation : public DummyDriveService {
|
| // DriveServiceInterface overrides.
|
| // Handles a request for obtaining an upload location URL.
|
| virtual void InitiateUploadNewFile(
|
| - const FilePath& drive_file_path,
|
| + const base::FilePath& drive_file_path,
|
| const std::string& content_type,
|
| int64 content_length,
|
| const GURL& parent_upload_url,
|
| @@ -87,7 +87,7 @@ class MockDriveServiceWithUploadExpectation : public DummyDriveService {
|
| }
|
|
|
| virtual void InitiateUploadExistingFile(
|
| - const FilePath& drive_file_path,
|
| + const base::FilePath& drive_file_path,
|
| const std::string& content_type,
|
| int64 content_length,
|
| const GURL& upload_url,
|
| @@ -171,7 +171,7 @@ class MockDriveServiceWithUploadExpectation : public DummyDriveService {
|
| class MockDriveServiceNoConnectionAtInitiate : public DummyDriveService {
|
| // Returns error.
|
| virtual void InitiateUploadNewFile(
|
| - const FilePath& drive_file_path,
|
| + const base::FilePath& drive_file_path,
|
| const std::string& content_type,
|
| int64 content_length,
|
| const GURL& parent_upload_url,
|
| @@ -182,7 +182,7 @@ class MockDriveServiceNoConnectionAtInitiate : public DummyDriveService {
|
| }
|
|
|
| virtual void InitiateUploadExistingFile(
|
| - const FilePath& drive_file_path,
|
| + const base::FilePath& drive_file_path,
|
| const std::string& content_type,
|
| int64 content_length,
|
| const GURL& upload_url,
|
| @@ -203,7 +203,7 @@ class MockDriveServiceNoConnectionAtInitiate : public DummyDriveService {
|
| class MockDriveServiceNoConnectionAtResume : public DummyDriveService {
|
| // Succeeds and returns an upload location URL.
|
| virtual void InitiateUploadNewFile(
|
| - const FilePath& drive_file_path,
|
| + const base::FilePath& drive_file_path,
|
| const std::string& content_type,
|
| int64 content_length,
|
| const GURL& parent_upload_url,
|
| @@ -214,7 +214,7 @@ class MockDriveServiceNoConnectionAtResume : public DummyDriveService {
|
| }
|
|
|
| virtual void InitiateUploadExistingFile(
|
| - const FilePath& drive_file_path,
|
| + const base::FilePath& drive_file_path,
|
| const std::string& content_type,
|
| int64 content_length,
|
| const GURL& upload_url,
|
|
|