summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/drive/download_handler_unittest.cc
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-02 04:55:52 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-02 04:55:52 +0000
commit67241b83d4bd573d00f1fa6e6056cf25f74ddf49 (patch)
tree7613732325f898bcafbb7c9eac0f31e9ce9e5cd9 /chrome/browser/chromeos/drive/download_handler_unittest.cc
parentce34e101af48b9b576b6cdee5fac7f88a956ec21 (diff)
downloadchromium_src-67241b83d4bd573d00f1fa6e6056cf25f74ddf49.zip
chromium_src-67241b83d4bd573d00f1fa6e6056cf25f74ddf49.tar.gz
chromium_src-67241b83d4bd573d00f1fa6e6056cf25f74ddf49.tar.bz2
Rename drive::DriveEntryProto to drive::ResourceEntry
As part of an effort to remove 'drive' prefix from c/b/chromeos/drive. BUG=233482 TEST=none R=kinaba@chromium.org, thestig@chromium.org Review URL: https://codereview.chromium.org/14616011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/drive/download_handler_unittest.cc')
-rw-r--r--chrome/browser/chromeos/drive/download_handler_unittest.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/drive/download_handler_unittest.cc b/chrome/browser/chromeos/drive/download_handler_unittest.cc
index c967b3c..42dfca2 100644
--- a/chrome/browser/chromeos/drive/download_handler_unittest.cc
+++ b/chrome/browser/chromeos/drive/download_handler_unittest.cc
@@ -111,7 +111,7 @@ TEST_F(DownloadHandlerTest, SubstituteDriveDownloadPath) {
google_apis::test_util::RunBlockingPoolTask();
// Return result of GetEntryInfoByPath(), destination directory found.
- scoped_ptr<DriveEntryProto> entry(new DriveEntryProto);
+ scoped_ptr<ResourceEntry> entry(new ResourceEntry);
ASSERT_FALSE(get_entry_info_callback_.is_null());
get_entry_info_callback_.Run(FILE_ERROR_OK, entry.Pass());
google_apis::test_util::RunBlockingPoolTask();
@@ -137,7 +137,7 @@ TEST_F(DownloadHandlerTest, SubstituteDriveDownloadPathGetEntryFailure) {
// Return result of GetEntryInfoByPath(), failing for some reason.
ASSERT_FALSE(get_entry_info_callback_.is_null());
get_entry_info_callback_.Run(FILE_ERROR_FAILED,
- scoped_ptr<DriveEntryProto>());
+ scoped_ptr<ResourceEntry>());
google_apis::test_util::RunBlockingPoolTask();
// Check the result.
@@ -159,7 +159,7 @@ TEST_F(DownloadHandlerTest, SubstituteDriveDownloadPathCreateDirectory) {
// Return result of GetEntryInfoByPath(), destination directory not found.
ASSERT_FALSE(get_entry_info_callback_.is_null());
get_entry_info_callback_.Run(FILE_ERROR_NOT_FOUND,
- scoped_ptr<DriveEntryProto>());
+ scoped_ptr<ResourceEntry>());
google_apis::test_util::RunBlockingPoolTask();
// Return result of CreateDirecotry().
@@ -189,7 +189,7 @@ TEST_F(DownloadHandlerTest,
// Return result of GetEntryInfoByPath(), destination directory not found.
ASSERT_FALSE(get_entry_info_callback_.is_null());
get_entry_info_callback_.Run(FILE_ERROR_NOT_FOUND,
- scoped_ptr<DriveEntryProto>());
+ scoped_ptr<ResourceEntry>());
google_apis::test_util::RunBlockingPoolTask();
// Return result of CreateDirecotry().
@@ -216,7 +216,7 @@ TEST_F(DownloadHandlerTest, SubstituteDriveDownloadPathForSavePackage) {
google_apis::test_util::RunBlockingPoolTask();
// Return result of GetEntryInfoByPath(), destination directory found.
- scoped_ptr<DriveEntryProto> entry(new DriveEntryProto);
+ scoped_ptr<ResourceEntry> entry(new ResourceEntry);
ASSERT_FALSE(get_entry_info_callback_.is_null());
get_entry_info_callback_.Run(FILE_ERROR_OK, entry.Pass());
google_apis::test_util::RunBlockingPoolTask();
@@ -253,7 +253,7 @@ TEST_F(DownloadHandlerTest, CheckForFileExistence) {
// Return result of GetEntryInfoByPath(), file exists.
{
- scoped_ptr<DriveEntryProto> entry(new DriveEntryProto);
+ scoped_ptr<ResourceEntry> entry(new ResourceEntry);
ASSERT_FALSE(get_entry_info_callback_.is_null());
get_entry_info_callback_.Run(FILE_ERROR_OK, entry.Pass());
}
@@ -274,7 +274,7 @@ TEST_F(DownloadHandlerTest, CheckForFileExistence) {
// Return result of GetEntryInfoByPath(), file does not exist.
ASSERT_FALSE(get_entry_info_callback_.is_null());
get_entry_info_callback_.Run(FILE_ERROR_NOT_FOUND,
- scoped_ptr<DriveEntryProto>());
+ scoped_ptr<ResourceEntry>());
google_apis::test_util::RunBlockingPoolTask();
// Check the result.