drive: Rename DriveResourceMetadata to ResourceMetadata
As part of an effort to remove 'drive' prefix from c/b/chromeos/drive.
BUG=231807
TEST=none
[email protected]
# for chrome/browser/ui/webui/screenshot_source.h
Review URL: https://codereview.chromium.org/14002010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196668 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/chromeos/drive/change_list_loader.cc b/chrome/browser/chromeos/drive/change_list_loader.cc
index a7394ca..55a6922 100644
--- a/chrome/browser/chromeos/drive/change_list_loader.cc
+++ b/chrome/browser/chromeos/drive/change_list_loader.cc
@@ -22,7 +22,7 @@
namespace drive {
-ChangeListLoader::ChangeListLoader(DriveResourceMetadata* resource_metadata,
+ChangeListLoader::ChangeListLoader(ResourceMetadata* resource_metadata,
JobScheduler* scheduler,
DriveWebAppsRegistry* webapps_registry)
: resource_metadata_(resource_metadata),
diff --git a/chrome/browser/chromeos/drive/change_list_loader.h b/chrome/browser/chromeos/drive/change_list_loader.h
index e1b6ba51..75894071 100644
--- a/chrome/browser/chromeos/drive/change_list_loader.h
+++ b/chrome/browser/chromeos/drive/change_list_loader.h
@@ -12,7 +12,7 @@
#include "base/callback_forward.h"
#include "base/memory/scoped_vector.h"
#include "base/observer_list.h"
-#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/resource_metadata.h"
#include "chrome/browser/google_apis/gdata_errorcode.h"
class GURL;
@@ -39,7 +39,7 @@
// Documents List API) or Google Drive API and load the cached metadata.
class ChangeListLoader {
public:
- ChangeListLoader(DriveResourceMetadata* resource_metadata,
+ ChangeListLoader(ResourceMetadata* resource_metadata,
JobScheduler* scheduler,
DriveWebAppsRegistry* webapps_registry);
~ChangeListLoader();
@@ -266,7 +266,7 @@
void NotifyDirectoryChangedAfterApplyFeed(bool should_notify,
const base::Closure& callback);
- DriveResourceMetadata* resource_metadata_; // Not owned.
+ ResourceMetadata* resource_metadata_; // Not owned.
JobScheduler* scheduler_; // Not owned.
DriveWebAppsRegistry* webapps_registry_; // Not owned.
ObserverList<ChangeListLoaderObserver> observers_;
diff --git a/chrome/browser/chromeos/drive/change_list_processor.cc b/chrome/browser/chromeos/drive/change_list_processor.cc
index 68a55dd8..26a7401 100644
--- a/chrome/browser/chromeos/drive/change_list_processor.cc
+++ b/chrome/browser/chromeos/drive/change_list_processor.cc
@@ -8,9 +8,9 @@
#include "base/metrics/histogram.h"
#include "chrome/browser/chromeos/drive/drive.pb.h"
-#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
#include "chrome/browser/chromeos/drive/file_system_util.h"
#include "chrome/browser/chromeos/drive/resource_entry_conversion.h"
+#include "chrome/browser/chromeos/drive/resource_metadata.h"
#include "chrome/browser/google_apis/gdata_wapi_parser.h"
#include "content/public/browser/browser_thread.h"
@@ -20,7 +20,7 @@
namespace {
-// Callback for DriveResourceMetadata::SetLargestChangestamp.
+// Callback for ResourceMetadata::SetLargestChangestamp.
// Runs |on_complete_callback|. |on_complete_callback| must not be null.
void RunOnCompleteCallback(const base::Closure& on_complete_callback,
FileError error) {
@@ -82,7 +82,7 @@
};
ChangeListProcessor::ChangeListProcessor(
- DriveResourceMetadata* resource_metadata)
+ ResourceMetadata* resource_metadata)
: resource_metadata_(resource_metadata),
largest_changestamp_(0),
ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
diff --git a/chrome/browser/chromeos/drive/change_list_processor.h b/chrome/browser/chromeos/drive/change_list_processor.h
index 353cfa3..b3b9a14 100644
--- a/chrome/browser/chromeos/drive/change_list_processor.h
+++ b/chrome/browser/chromeos/drive/change_list_processor.h
@@ -25,7 +25,7 @@
namespace drive {
class DriveEntryProto;
-class DriveResourceMetadata;
+class ResourceMetadata;
// Class to represent a change list.
class ChangeList {
@@ -56,7 +56,7 @@
// Class used to record UMA stats with FeedToEntryProtoMap().
class ChangeListToEntryProtoMapUMAStats;
- explicit ChangeListProcessor(DriveResourceMetadata* resource_metadata);
+ explicit ChangeListProcessor(ResourceMetadata* resource_metadata);
~ChangeListProcessor();
// Applies the documents feeds to the file system using |resource_metadata_|.
@@ -106,7 +106,7 @@
void ApplyEntryProto(const DriveEntryProto& entry_proto);
// Continue ApplyEntryProto. This is a callback for
- // DriveResourceMetadata::GetEntryInfoByResourceId.
+ // ResourceMetadata::GetEntryInfoByResourceId.
void ContinueApplyEntryProto(
const DriveEntryProto& entry_proto,
FileError error,
@@ -120,7 +120,7 @@
// as a side effect.
void AddEntry(const DriveEntryProto& entry_proto);
- // Callback for DriveResourceMetadata::AddEntry.
+ // Callback for ResourceMetadata::AddEntry.
void NotifyForAddEntry(bool is_directory,
FileError error,
const base::FilePath& file_path);
@@ -132,13 +132,13 @@
const base::FilePath& file_path);
// Continues RemoveEntryFromParent after
- // DriveResourceMetadata::GetChildDirectories.
+ // ResourceMetadata::GetChildDirectories.
void OnGetChildrenForRemove(
const DriveEntryProto& entry_proto,
const base::FilePath& file_path,
const std::set<base::FilePath>& child_directories);
- // Callback for DriveResourceMetadata::RemoveEntryFromParent.
+ // Callback for ResourceMetadata::RemoveEntryFromParent.
void NotifyForRemoveEntryFromParent(
bool is_directory,
const base::FilePath& file_path,
@@ -146,12 +146,12 @@
FileError error,
const base::FilePath& parent_path);
- // Refreshes DriveResourceMetadata entry that has the same resource_id as
+ // Refreshes ResourceMetadata entry that has the same resource_id as
// |entry_proto| with |entry_proto|. Updates changed_dirs_ as a side effect.
void RefreshEntry(const DriveEntryProto& entry_proto,
const base::FilePath& file_path);
- // Callback for DriveResourceMetadata::RefreshEntry.
+ // Callback for ResourceMetadata::RefreshEntry.
void NotifyForRefreshEntry(
const base::FilePath& old_file_path,
FileError error,
@@ -164,14 +164,14 @@
void UpdateRootEntry(const base::Closure& closure);
// Part of UpdateRootEntry(). Called after
- // DriveResourceMetadata::GetEntryInfoByPath is complete. Updates the root
+ // ResourceMetadata::GetEntryInfoByPath is complete. Updates the root
// proto, and refreshes the root entry with the proto.
void UpdateRootEntryAfterGetEntry(const base::Closure& closure,
FileError error,
scoped_ptr<DriveEntryProto> root_proto);
// Part of UpdateRootEntry(). Called after
- // DriveResourceMetadata::RefreshEntry() is complete. Calls OnComplete() to
+ // ResourceMetadata::RefreshEntry() is complete. Calls OnComplete() to
// finish the change list processing.
void UpdateRootEntryAfterRefreshEntry(const base::Closure& closure,
FileError error,
@@ -184,7 +184,7 @@
// Reset the state of this object.
void Clear();
- DriveResourceMetadata* resource_metadata_; // Not owned.
+ ResourceMetadata* resource_metadata_; // Not owned.
DriveEntryProtoMap entry_proto_map_;
std::set<base::FilePath> changed_dirs_;
diff --git a/chrome/browser/chromeos/drive/drive.proto b/chrome/browser/chromeos/drive/drive.proto
index 339569b..1dbe24ed 100644
--- a/chrome/browser/chromeos/drive/drive.proto
+++ b/chrome/browser/chromeos/drive/drive.proto
@@ -82,8 +82,8 @@
optional DriveDirectorySpecificInfo directory_specific_info = 13;
}
-// Container for the header part of DriveResourceMetadata.
-message DriveResourceMetadataHeader {
+// Container for the header part of ResourceMetadata.
+message ResourceMetadataHeader {
// Monotonically increasing version number, which is changed when
// incompatible change is made to the DB format. kDBVersion in
// drive_resource_metadata_storage.h defines the current version.
diff --git a/chrome/browser/chromeos/drive/drive_file_system.cc b/chrome/browser/chromeos/drive/drive_file_system.cc
index 4c446b7..f894f47 100644
--- a/chrome/browser/chromeos/drive/drive_file_system.cc
+++ b/chrome/browser/chromeos/drive/drive_file_system.cc
@@ -78,7 +78,7 @@
callback.Run(error, path, entry_proto.Pass());
}
-// Callback for DriveResourceMetadata::GetLargestChangestamp.
+// Callback for ResourceMetadata::GetLargestChangestamp.
// |callback| must not be null.
void OnGetLargestChangestamp(
DriveFileSystemMetadata metadata, // Will be modified.
@@ -210,7 +210,7 @@
google_apis::DriveServiceInterface* drive_service,
JobScheduler* scheduler,
DriveWebAppsRegistry* webapps_registry,
- DriveResourceMetadata* resource_metadata,
+ ResourceMetadata* resource_metadata,
base::SequencedTaskRunner* blocking_task_runner)
: profile_(profile),
cache_(cache),
@@ -679,8 +679,8 @@
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
- // DriveResourceMetadata may know about the entry even if the resource
- // metadata is not yet fully loaded. For instance, DriveResourceMetadata()
+ // ResourceMetadata may know about the entry even if the resource
+ // metadata is not yet fully loaded. For instance, ResourceMetadata()
// always knows about the root directory. For "fast fetch"
// (crbug.com/178348) to work, it's needed to delay the resource metadata
// loading until the first call to ReadDirectoryByPath().
@@ -757,9 +757,9 @@
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
- // As described in GetEntryInfoByPath(), DriveResourceMetadata may know
+ // As described in GetEntryInfoByPath(), ResourceMetadata may know
// about the entry even if the file system is not yet fully loaded, hence we
- // should just ask DriveResourceMetadata first.
+ // should just ask ResourceMetadata first.
resource_metadata_->GetEntryInfoByPath(
directory_path,
base::Bind(&DriveFileSystem::ReadDirectoryByPathAfterGetEntry,
diff --git a/chrome/browser/chromeos/drive/drive_file_system.h b/chrome/browser/chromeos/drive/drive_file_system.h
index 8883ea7..9ce505dc 100644
--- a/chrome/browser/chromeos/drive/drive_file_system.h
+++ b/chrome/browser/chromeos/drive/drive_file_system.h
@@ -37,10 +37,10 @@
class ChangeList;
class ChangeListLoader;
class DriveCacheEntry;
-class DriveResourceMetadata;
class DriveWebAppsRegistry;
class FileSystemObserver;
class JobScheduler;
+class ResourceMetadata;
// The production implementation of DriveFileSystemInterface.
class DriveFileSystem : public DriveFileSystemInterface,
@@ -52,7 +52,7 @@
google_apis::DriveServiceInterface* drive_service,
JobScheduler* scheduler,
DriveWebAppsRegistry* webapps_registry,
- DriveResourceMetadata* resource_metadata,
+ ResourceMetadata* resource_metadata,
base::SequencedTaskRunner* blocking_task_runner);
virtual ~DriveFileSystem();
@@ -194,7 +194,7 @@
ScopedVector<ChangeList> change_lists,
FileError error);
- // Callback for DriveResourceMetadata::RefreshEntry, from OnSearch.
+ // Callback for ResourceMetadata::RefreshEntry, from OnSearch.
// Adds |drive_file_path| to |results|. When |entry_proto| is not present in
// the local file system snapshot, it is not added to |results|. Instead,
// CheckForUpdates is called. Runs |callback| with |results| if
@@ -314,11 +314,11 @@
void InitializePreferenceObserver();
// Part of GetEntryInfoByPath()
- // 1) Called when DriveResourceMetadata::GetEntryInfoByPath() is complete.
+ // 1) Called when ResourceMetadata::GetEntryInfoByPath() is complete.
// If succeeded, GetEntryInfoByPath() returns immediately here.
// Otherwise, starts loading the file system.
// 2) Called when LoadIfNeeded() is complete.
- // 3) Called when DriveResourceMetadata::GetEntryInfoByPath() is complete.
+ // 3) Called when ResourceMetadata::GetEntryInfoByPath() is complete.
void GetEntryInfoByPathAfterGetEntry1(
const base::FilePath& file_path,
const GetEntryInfoCallback& callback,
@@ -333,9 +333,9 @@
scoped_ptr<DriveEntryProto> entry_proto);
// Part of ReadDirectoryByPath()
- // 1) Called when DriveResourceMetadata::GetEntryInfoByPath() is complete.
+ // 1) Called when ResourceMetadata::GetEntryInfoByPath() is complete.
// 2) Called when LoadIfNeeded() is complete.
- // 3) Called when DriveResourceMetadata::ReadDirectoryByPath() is complete.
+ // 3) Called when ResourceMetadata::ReadDirectoryByPath() is complete.
// |callback| must not be null.
void ReadDirectoryByPathAfterGetEntry(
const base::FilePath& directory_path,
@@ -401,7 +401,7 @@
const base::FilePath& cache_file);
// Part of GetEntryInfoByResourceId(). Called after
- // DriveResourceMetadata::GetEntryInfoByResourceId() is complete.
+ // ResourceMetadata::GetEntryInfoByResourceId() is complete.
// |callback| must not be null.
void GetEntryInfoByResourceIdAfterGetEntry(
const GetEntryInfoWithFilePathCallback& callback,
@@ -410,7 +410,7 @@
scoped_ptr<DriveEntryProto> entry_proto);
// Part of GetFileByResourceId(). Called after
- // DriveResourceMetadata::GetEntryInfoByResourceId() is complete.
+ // ResourceMetadata::GetEntryInfoByResourceId() is complete.
// |get_file_callback| must not be null.
// |get_content_callback| may be null.
void GetFileByResourceIdAfterGetEntry(
@@ -422,7 +422,7 @@
scoped_ptr<DriveEntryProto> entry_proto);
// Part of GetFileContentByPath(). Called after
- // DriveResourceMetadata::GetEntryInfoByPath() is complete.
+ // ResourceMetadata::GetEntryInfoByPath() is complete.
// |initialized_callback|, |get_content_callback| and |completion_callback|
// must not be null.
void GetFileContentByPathAfterGetEntry(
@@ -478,7 +478,7 @@
google_apis::DriveServiceInterface* drive_service_;
JobScheduler* scheduler_;
DriveWebAppsRegistry* webapps_registry_;
- DriveResourceMetadata* resource_metadata_;
+ ResourceMetadata* resource_metadata_;
// Time of the last update check.
base::Time last_update_check_time_;
diff --git a/chrome/browser/chromeos/drive/drive_file_system_interface.h b/chrome/browser/chromeos/drive/drive_file_system_interface.h
index 078d77c..2b01477 100644
--- a/chrome/browser/chromeos/drive/drive_file_system_interface.h
+++ b/chrome/browser/chromeos/drive/drive_file_system_interface.h
@@ -12,7 +12,7 @@
#include "chrome/browser/chromeos/drive/drive.pb.h"
#include "chrome/browser/chromeos/drive/drive_cache.h"
#include "chrome/browser/chromeos/drive/drive_file_system_metadata.h"
-#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/resource_metadata.h"
#include "chrome/browser/google_apis/gdata_wapi_operations.h"
namespace google_apis {
@@ -21,8 +21,8 @@
namespace drive {
-class DriveResourceMetadata;
class FileSystemObserver;
+class ResourceMetadata;
typedef std::vector<DriveEntryProto> DriveEntryProtoVector;
diff --git a/chrome/browser/chromeos/drive/drive_file_system_unittest.cc b/chrome/browser/chromeos/drive/drive_file_system_unittest.cc
index 1d42489..9df447cd 100644
--- a/chrome/browser/chromeos/drive/drive_file_system_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_file_system_unittest.cc
@@ -161,7 +161,7 @@
}
void SetUpResourceMetadataAndFileSystem() {
- resource_metadata_.reset(new DriveResourceMetadata(
+ resource_metadata_.reset(new ResourceMetadata(
cache_->GetCacheDirectoryPath(DriveCache::CACHE_TYPE_META),
blocking_task_runner_));
@@ -314,8 +314,8 @@
const std::string root_resource_id =
fake_drive_service_->GetRootResourceId();
- scoped_ptr<DriveResourceMetadata, test_util::DestroyHelperForTests>
- resource_metadata(new DriveResourceMetadata(
+ scoped_ptr<ResourceMetadata, test_util::DestroyHelperForTests>
+ resource_metadata(new ResourceMetadata(
cache_->GetCacheDirectoryPath(DriveCache::CACHE_TYPE_META),
blocking_task_runner_));
@@ -333,7 +333,7 @@
if (error != FILE_ERROR_OK)
return false;
- // drive/root is already prepared by DriveResourceMetadata.
+ // drive/root is already prepared by ResourceMetadata.
base::FilePath file_path;
// drive/root
@@ -451,7 +451,7 @@
scoped_ptr<google_apis::FakeDriveService> fake_drive_service_;
scoped_ptr<JobScheduler> scheduler_;
scoped_ptr<DriveWebAppsRegistry> drive_webapps_registry_;
- scoped_ptr<DriveResourceMetadata, test_util::DestroyHelperForTests>
+ scoped_ptr<ResourceMetadata, test_util::DestroyHelperForTests>
resource_metadata_;
scoped_ptr<FakeFreeDiskSpaceGetter> fake_free_disk_space_getter_;
scoped_ptr<StrictMock<MockCacheObserver> > mock_cache_observer_;
diff --git a/chrome/browser/chromeos/drive/drive_system_service.cc b/chrome/browser/chromeos/drive/drive_system_service.cc
index d0920cb..1d0f039 100644
--- a/chrome/browser/chromeos/drive/drive_system_service.cc
+++ b/chrome/browser/chromeos/drive/drive_system_service.cc
@@ -132,7 +132,7 @@
// We can call DriveCache::GetCacheDirectoryPath safely even before the cache
// gets initialized.
- resource_metadata_.reset(new DriveResourceMetadata(
+ resource_metadata_.reset(new ResourceMetadata(
cache_->GetCacheDirectoryPath(DriveCache::CACHE_TYPE_META),
blocking_task_runner_));
diff --git a/chrome/browser/chromeos/drive/drive_system_service.h b/chrome/browser/chromeos/drive/drive_system_service.h
index 0d33900..9619146 100644
--- a/chrome/browser/chromeos/drive/drive_system_service.h
+++ b/chrome/browser/chromeos/drive/drive_system_service.h
@@ -33,11 +33,11 @@
class DownloadHandler;
class DriveCache;
class DriveFileSystemInterface;
-class DriveResourceMetadata;
class DriveWebAppsRegistry;
class FileSystemProxy;
class FileWriteHelper;
class JobListInterface;
+class ResourceMetadata;
class StaleCacheFilesRemover;
class SyncClient;
@@ -156,7 +156,7 @@
scoped_ptr<google_apis::DriveServiceInterface> drive_service_;
scoped_ptr<JobScheduler> scheduler_;
scoped_ptr<DriveWebAppsRegistry> webapps_registry_;
- scoped_ptr<DriveResourceMetadata, util::DestroyHelper> resource_metadata_;
+ scoped_ptr<ResourceMetadata, util::DestroyHelper> resource_metadata_;
scoped_ptr<DriveFileSystemInterface> file_system_;
scoped_ptr<FileWriteHelper> file_write_helper_;
scoped_ptr<DownloadHandler> download_handler_;
diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation.cc b/chrome/browser/chromeos/drive/file_system/copy_operation.cc
index 4360827..b652cf3 100644
--- a/chrome/browser/chromeos/drive/file_system/copy_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/copy_operation.cc
@@ -77,7 +77,7 @@
CopyOperation::CopyOperation(
JobScheduler* job_scheduler,
DriveFileSystemInterface* drive_file_system,
- DriveResourceMetadata* metadata,
+ ResourceMetadata* metadata,
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
OperationObserver* observer)
: job_scheduler_(job_scheduler),
diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation.h b/chrome/browser/chromeos/drive/file_system/copy_operation.h
index 2f20c7b9..1b215431 100644
--- a/chrome/browser/chromeos/drive/file_system/copy_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/copy_operation.h
@@ -8,7 +8,7 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/resource_metadata.h"
#include "chrome/browser/google_apis/gdata_errorcode.h"
class GURL;
@@ -40,7 +40,7 @@
public:
CopyOperation(JobScheduler* job_scheduler,
DriveFileSystemInterface* drive_file_system,
- DriveResourceMetadata* metadata,
+ ResourceMetadata* metadata,
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
OperationObserver* observer);
virtual ~CopyOperation();
@@ -199,7 +199,7 @@
JobScheduler* job_scheduler_;
DriveFileSystemInterface* drive_file_system_;
- DriveResourceMetadata* metadata_;
+ ResourceMetadata* metadata_;
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
OperationObserver* observer_;
diff --git a/chrome/browser/chromeos/drive/file_system/create_directory_operation.cc b/chrome/browser/chromeos/drive/file_system/create_directory_operation.cc
index c17677f..cdfe5a6c 100644
--- a/chrome/browser/chromeos/drive/file_system/create_directory_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/create_directory_operation.cc
@@ -75,7 +75,7 @@
CreateDirectoryOperation::CreateDirectoryOperation(
JobScheduler* job_scheduler,
- DriveResourceMetadata* metadata,
+ ResourceMetadata* metadata,
OperationObserver* observer)
: job_scheduler_(job_scheduler),
metadata_(metadata),
diff --git a/chrome/browser/chromeos/drive/file_system/create_directory_operation.h b/chrome/browser/chromeos/drive/file_system/create_directory_operation.h
index d725ded..62d6ead 100644
--- a/chrome/browser/chromeos/drive/file_system/create_directory_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/create_directory_operation.h
@@ -23,8 +23,8 @@
namespace drive {
class DriveEntryProto;
-class DriveResourceMetadata;
class JobScheduler;
+class ResourceMetadata;
namespace file_system {
@@ -36,7 +36,7 @@
class CreateDirectoryOperation {
public:
CreateDirectoryOperation(JobScheduler* job_scheduler,
- DriveResourceMetadata* metadata,
+ ResourceMetadata* metadata,
OperationObserver* observer);
~CreateDirectoryOperation();
@@ -116,7 +116,7 @@
google_apis::GDataErrorCode status,
scoped_ptr<google_apis::ResourceEntry> entry);
- // Callback for DriveResourceMetadata::AddEntryToDirectory. Continues the
+ // Callback for ResourceMetadata::AddEntryToDirectory. Continues the
// recursive creation of a directory path by calling CreateDirectory again.
void ContinueCreateDirectory(scoped_ptr<CreateDirectoryParams> params,
const base::FilePath& created_directory_path,
@@ -142,7 +142,7 @@
scoped_ptr<DriveEntryProto> entry_proto);
JobScheduler* job_scheduler_;
- DriveResourceMetadata* metadata_;
+ ResourceMetadata* metadata_;
OperationObserver* observer_;
// WeakPtrFactory bound to the UI thread.
diff --git a/chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc
index 0b4fa5a1..33fe8f2 100644
--- a/chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc
@@ -8,10 +8,10 @@
#include "base/message_loop.h"
#include "base/threading/sequenced_worker_pool.h"
#include "chrome/browser/chromeos/drive/change_list_loader.h"
-#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
#include "chrome/browser/chromeos/drive/drive_webapps_registry.h"
#include "chrome/browser/chromeos/drive/file_system/operation_observer.h"
#include "chrome/browser/chromeos/drive/job_scheduler.h"
+#include "chrome/browser/chromeos/drive/resource_metadata.h"
#include "chrome/browser/chromeos/drive/test_util.h"
#include "chrome/browser/google_apis/fake_drive_service.h"
#include "chrome/browser/google_apis/test_util.h"
@@ -46,8 +46,8 @@
"chromeos/gdata/account_metadata.json");
fake_drive_service_->LoadAppListForDriveApi("chromeos/drive/applist.json");
- metadata_.reset(new DriveResourceMetadata(temp_dir_.path(),
- blocking_task_runner_));
+ metadata_.reset(new ResourceMetadata(temp_dir_.path(),
+ blocking_task_runner_));
FileError error = FILE_ERROR_FAILED;
metadata_->Initialize(
@@ -101,7 +101,7 @@
base::ScopedTempDir temp_dir_;
scoped_ptr<google_apis::FakeDriveService> fake_drive_service_;
- scoped_ptr<DriveResourceMetadata, test_util::DestroyHelperForTests> metadata_;
+ scoped_ptr<ResourceMetadata, test_util::DestroyHelperForTests> metadata_;
scoped_ptr<JobScheduler> scheduler_;
scoped_ptr<CreateDirectoryOperation> operation_;
diff --git a/chrome/browser/chromeos/drive/file_system/drive_operations.cc b/chrome/browser/chromeos/drive/file_system/drive_operations.cc
index 43932b4..6527fa6 100644
--- a/chrome/browser/chromeos/drive/file_system/drive_operations.cc
+++ b/chrome/browser/chromeos/drive/file_system/drive_operations.cc
@@ -29,7 +29,7 @@
JobScheduler* job_scheduler,
DriveFileSystemInterface* drive_file_system,
DriveCache* cache,
- DriveResourceMetadata* metadata,
+ ResourceMetadata* metadata,
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
OperationObserver* observer) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
diff --git a/chrome/browser/chromeos/drive/file_system/drive_operations.h b/chrome/browser/chromeos/drive/file_system/drive_operations.h
index cd830e1..6fe9799d 100644
--- a/chrome/browser/chromeos/drive/file_system/drive_operations.h
+++ b/chrome/browser/chromeos/drive/file_system/drive_operations.h
@@ -8,7 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/sequenced_task_runner.h"
#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
-#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/resource_metadata.h"
namespace base {
class FilePath;
@@ -39,7 +39,7 @@
void Init(JobScheduler* job_scheduler,
DriveFileSystemInterface* drive_file_system,
DriveCache* cache,
- DriveResourceMetadata* metadata,
+ ResourceMetadata* metadata,
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
OperationObserver* observer);
diff --git a/chrome/browser/chromeos/drive/file_system/move_operation.cc b/chrome/browser/chromeos/drive/file_system/move_operation.cc
index 1a3f3c6..5f407de 100644
--- a/chrome/browser/chromeos/drive/file_system/move_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/move_operation.cc
@@ -17,7 +17,7 @@
namespace file_system {
MoveOperation::MoveOperation(JobScheduler* job_scheduler,
- DriveResourceMetadata* metadata,
+ ResourceMetadata* metadata,
OperationObserver* observer)
: job_scheduler_(job_scheduler),
metadata_(metadata),
diff --git a/chrome/browser/chromeos/drive/file_system/move_operation.h b/chrome/browser/chromeos/drive/file_system/move_operation.h
index 58be865..d836821 100644
--- a/chrome/browser/chromeos/drive/file_system/move_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/move_operation.h
@@ -8,7 +8,7 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/resource_metadata.h"
#include "chrome/browser/google_apis/gdata_errorcode.h"
class GURL;
@@ -21,8 +21,8 @@
class DriveCache;
class DriveEntryProto;
-class DriveResourceMetadata;
class JobScheduler;
+class ResourceMetadata;
namespace file_system {
@@ -34,7 +34,7 @@
class MoveOperation {
public:
MoveOperation(JobScheduler* job_scheduler,
- DriveResourceMetadata* metadata,
+ ResourceMetadata* metadata,
OperationObserver* observer);
virtual ~MoveOperation();
@@ -119,7 +119,7 @@
google_apis::GDataErrorCode status);
JobScheduler* job_scheduler_;
- DriveResourceMetadata* metadata_;
+ ResourceMetadata* metadata_;
OperationObserver* observer_;
// WeakPtrFactory bound to the UI thread.
diff --git a/chrome/browser/chromeos/drive/file_system/remove_operation.cc b/chrome/browser/chromeos/drive/file_system/remove_operation.cc
index 6009793..0fbe796 100644
--- a/chrome/browser/chromeos/drive/file_system/remove_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/remove_operation.cc
@@ -25,7 +25,7 @@
RemoveOperation::RemoveOperation(
JobScheduler* job_scheduler,
DriveCache* cache,
- DriveResourceMetadata* metadata,
+ ResourceMetadata* metadata,
OperationObserver* observer)
: job_scheduler_(job_scheduler),
cache_(cache),
diff --git a/chrome/browser/chromeos/drive/file_system/remove_operation.h b/chrome/browser/chromeos/drive/file_system/remove_operation.h
index be9b2177..0dd01170 100644
--- a/chrome/browser/chromeos/drive/file_system/remove_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/remove_operation.h
@@ -8,7 +8,7 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/resource_metadata.h"
#include "chrome/browser/google_apis/gdata_errorcode.h"
class GURL;
@@ -38,7 +38,7 @@
public:
RemoveOperation(JobScheduler* job_scheduler,
DriveCache* cache,
- DriveResourceMetadata* metadata,
+ ResourceMetadata* metadata,
OperationObserver* observer);
virtual ~RemoveOperation();
@@ -74,7 +74,7 @@
JobScheduler* job_scheduler_;
DriveCache* cache_;
- DriveResourceMetadata* metadata_;
+ ResourceMetadata* metadata_;
OperationObserver* observer_;
// WeakPtrFactory bound to the UI thread.
diff --git a/chrome/browser/chromeos/drive/file_system/update_operation.cc b/chrome/browser/chromeos/drive/file_system/update_operation.cc
index 299f623..f9e77b3c 100644
--- a/chrome/browser/chromeos/drive/file_system/update_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/update_operation.cc
@@ -20,7 +20,7 @@
UpdateOperation::UpdateOperation(
DriveCache* cache,
- DriveResourceMetadata* metadata,
+ ResourceMetadata* metadata,
JobScheduler* scheduler,
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
OperationObserver* observer)
diff --git a/chrome/browser/chromeos/drive/file_system/update_operation.h b/chrome/browser/chromeos/drive/file_system/update_operation.h
index 64962ff..c7877d6 100644
--- a/chrome/browser/chromeos/drive/file_system/update_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/update_operation.h
@@ -9,7 +9,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
-#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/resource_metadata.h"
#include "chrome/browser/google_apis/gdata_errorcode.h"
class GURL;
@@ -34,7 +34,7 @@
class UpdateOperation {
public:
UpdateOperation(DriveCache* cache,
- DriveResourceMetadata* metadata,
+ ResourceMetadata* metadata,
JobScheduler* scheduler,
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
OperationObserver* observer);
@@ -55,7 +55,7 @@
private:
// Part of UpdateFileByResourceId(). Called when
- // DriveResourceMetadata::GetEntryInfoByResourceId() is complete.
+ // ResourceMetadata::GetEntryInfoByResourceId() is complete.
// |callback| must not be null.
void UpdateFileByEntryInfo(
DriveClientContext context,
@@ -95,7 +95,7 @@
scoped_ptr<DriveEntryProto> entry_proto);
DriveCache* cache_;
- DriveResourceMetadata* metadata_;
+ ResourceMetadata* metadata_;
JobScheduler* scheduler_;
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
OperationObserver* observer_;
diff --git a/chrome/browser/chromeos/drive/drive_resource_metadata.cc b/chrome/browser/chromeos/drive/resource_metadata.cc
similarity index 86%
rename from chrome/browser/chromeos/drive/drive_resource_metadata.cc
rename to chrome/browser/chromeos/drive/resource_metadata.cc
index 9a34ed4e..e69f68a 100644
--- a/chrome/browser/chromeos/drive/drive_resource_metadata.cc
+++ b/chrome/browser/chromeos/drive/resource_metadata.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/resource_metadata.h"
#include "base/file_util.h"
#include "base/stringprintf.h"
@@ -134,9 +134,9 @@
EntryInfoPairResult::~EntryInfoPairResult() {
}
-// DriveResourceMetadata class implementation.
+// ResourceMetadata class implementation.
-DriveResourceMetadata::DriveResourceMetadata(
+ResourceMetadata::ResourceMetadata(
const base::FilePath& data_directory_path,
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner)
: data_directory_path_(data_directory_path),
@@ -146,44 +146,44 @@
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
}
-void DriveResourceMetadata::Initialize(const FileOperationCallback& callback) {
+void ResourceMetadata::Initialize(const FileOperationCallback& callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
base::PostTaskAndReplyWithResult(
blocking_task_runner_,
FROM_HERE,
- base::Bind(&DriveResourceMetadata::InitializeOnBlockingPool,
+ base::Bind(&ResourceMetadata::InitializeOnBlockingPool,
base::Unretained(this)),
callback);
}
-void DriveResourceMetadata::Destroy() {
+void ResourceMetadata::Destroy() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
weak_ptr_factory_.InvalidateWeakPtrs();
blocking_task_runner_->PostTask(
FROM_HERE,
- base::Bind(&DriveResourceMetadata::DestroyOnBlockingPool,
+ base::Bind(&ResourceMetadata::DestroyOnBlockingPool,
base::Unretained(this)));
}
-void DriveResourceMetadata::Reset(const base::Closure& callback) {
+void ResourceMetadata::Reset(const base::Closure& callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
blocking_task_runner_->PostTaskAndReply(
FROM_HERE,
- base::Bind(&DriveResourceMetadata::ResetOnBlockingPool,
+ base::Bind(&ResourceMetadata::ResetOnBlockingPool,
base::Unretained(this)),
callback);
}
-DriveResourceMetadata::~DriveResourceMetadata() {
+ResourceMetadata::~ResourceMetadata() {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
}
-FileError DriveResourceMetadata::InitializeOnBlockingPool() {
+FileError ResourceMetadata::InitializeOnBlockingPool() {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
if (!EnoughDiskSpaceIsAvailableForDBOperation(data_directory_path_))
@@ -198,7 +198,7 @@
return FILE_ERROR_OK;
}
-void DriveResourceMetadata::SetUpDefaultEntries() {
+void ResourceMetadata::SetUpDefaultEntries() {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
// Initialize the grand root and "other" entries. "/drive" and "/drive/other".
@@ -215,12 +215,12 @@
}
}
-void DriveResourceMetadata::DestroyOnBlockingPool() {
+void ResourceMetadata::DestroyOnBlockingPool() {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
delete this;
}
-void DriveResourceMetadata::ResetOnBlockingPool() {
+void ResourceMetadata::ResetOnBlockingPool() {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
// TODO(hashimoto): Return FILE_ERROR_NO_SPACE here.
@@ -233,19 +233,19 @@
storage_->SetLargestChangestamp(0);
}
-void DriveResourceMetadata::GetLargestChangestamp(
+void ResourceMetadata::GetLargestChangestamp(
const GetChangestampCallback& callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
base::PostTaskAndReplyWithResult(
blocking_task_runner_,
FROM_HERE,
- base::Bind(&DriveResourceMetadata::GetLargestChangestampOnBlockingPool,
+ base::Bind(&ResourceMetadata::GetLargestChangestampOnBlockingPool,
base::Unretained(this)),
callback);
}
-void DriveResourceMetadata::SetLargestChangestamp(
+void ResourceMetadata::SetLargestChangestamp(
int64 value,
const FileOperationCallback& callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -253,25 +253,25 @@
base::PostTaskAndReplyWithResult(
blocking_task_runner_,
FROM_HERE,
- base::Bind(&DriveResourceMetadata::SetLargestChangestampOnBlockingPool,
+ base::Bind(&ResourceMetadata::SetLargestChangestampOnBlockingPool,
base::Unretained(this),
value),
callback);
}
-void DriveResourceMetadata::AddEntry(const DriveEntryProto& entry_proto,
- const FileMoveCallback& callback) {
+void ResourceMetadata::AddEntry(const DriveEntryProto& entry_proto,
+ const FileMoveCallback& callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
PostFileMoveTask(blocking_task_runner_,
- base::Bind(&DriveResourceMetadata::AddEntryOnBlockingPool,
+ base::Bind(&ResourceMetadata::AddEntryOnBlockingPool,
base::Unretained(this),
entry_proto),
callback);
}
-void DriveResourceMetadata::MoveEntryToDirectory(
+void ResourceMetadata::MoveEntryToDirectory(
const base::FilePath& file_path,
const base::FilePath& directory_path,
const FileMoveCallback& callback) {
@@ -280,40 +280,40 @@
PostFileMoveTask(
blocking_task_runner_,
- base::Bind(&DriveResourceMetadata::MoveEntryToDirectoryOnBlockingPool,
+ base::Bind(&ResourceMetadata::MoveEntryToDirectoryOnBlockingPool,
base::Unretained(this),
file_path,
directory_path),
callback);
}
-void DriveResourceMetadata::RenameEntry(const base::FilePath& file_path,
- const std::string& new_name,
- const FileMoveCallback& callback) {
+void ResourceMetadata::RenameEntry(const base::FilePath& file_path,
+ const std::string& new_name,
+ const FileMoveCallback& callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
PostFileMoveTask(blocking_task_runner_,
- base::Bind(&DriveResourceMetadata::RenameEntryOnBlockingPool,
+ base::Bind(&ResourceMetadata::RenameEntryOnBlockingPool,
base::Unretained(this),
file_path,
new_name),
callback);
}
-void DriveResourceMetadata::RemoveEntry(const std::string& resource_id,
- const FileMoveCallback& callback) {
+void ResourceMetadata::RemoveEntry(const std::string& resource_id,
+ const FileMoveCallback& callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
PostFileMoveTask(blocking_task_runner_,
- base::Bind(&DriveResourceMetadata::RemoveEntryOnBlockingPool,
+ base::Bind(&ResourceMetadata::RemoveEntryOnBlockingPool,
base::Unretained(this),
resource_id),
callback);
}
-void DriveResourceMetadata::GetEntryInfoByResourceId(
+void ResourceMetadata::GetEntryInfoByResourceId(
const std::string& resource_id,
const GetEntryInfoWithFilePathCallback& callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -325,7 +325,7 @@
base::PostTaskAndReplyWithResult(
blocking_task_runner_,
FROM_HERE,
- base::Bind(&DriveResourceMetadata::GetEntryInfoByResourceIdOnBlockingPool,
+ base::Bind(&ResourceMetadata::GetEntryInfoByResourceIdOnBlockingPool,
base::Unretained(this),
resource_id,
file_path,
@@ -336,7 +336,7 @@
base::Passed(&entry)));
}
-void DriveResourceMetadata::GetEntryInfoByPath(
+void ResourceMetadata::GetEntryInfoByPath(
const base::FilePath& file_path,
const GetEntryInfoCallback& callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -347,7 +347,7 @@
base::PostTaskAndReplyWithResult(
blocking_task_runner_,
FROM_HERE,
- base::Bind(&DriveResourceMetadata::GetEntryInfoByPathOnBlockingPool,
+ base::Bind(&ResourceMetadata::GetEntryInfoByPathOnBlockingPool,
base::Unretained(this),
file_path,
entry_ptr),
@@ -356,7 +356,7 @@
base::Passed(&entry)));
}
-void DriveResourceMetadata::ReadDirectoryByPath(
+void ResourceMetadata::ReadDirectoryByPath(
const base::FilePath& file_path,
const ReadDirectoryCallback& callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -367,7 +367,7 @@
base::PostTaskAndReplyWithResult(
blocking_task_runner_,
FROM_HERE,
- base::Bind(&DriveResourceMetadata::ReadDirectoryByPathOnBlockingPool,
+ base::Bind(&ResourceMetadata::ReadDirectoryByPathOnBlockingPool,
base::Unretained(this),
file_path,
entries_ptr),
@@ -376,7 +376,7 @@
base::Passed(&entries)));
}
-void DriveResourceMetadata::RefreshEntry(
+void ResourceMetadata::RefreshEntry(
const DriveEntryProto& entry_proto,
const GetEntryInfoWithFilePathCallback& callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -388,7 +388,7 @@
base::PostTaskAndReplyWithResult(
blocking_task_runner_,
FROM_HERE,
- base::Bind(&DriveResourceMetadata::RefreshEntryOnBlockingPool,
+ base::Bind(&ResourceMetadata::RefreshEntryOnBlockingPool,
base::Unretained(this),
entry_proto,
file_path,
@@ -399,7 +399,7 @@
base::Passed(&entry)));
}
-void DriveResourceMetadata::RefreshDirectory(
+void ResourceMetadata::RefreshDirectory(
const DirectoryFetchInfo& directory_fetch_info,
const DriveEntryProtoMap& entry_proto_map,
const FileMoveCallback& callback) {
@@ -408,14 +408,14 @@
PostFileMoveTask(
blocking_task_runner_,
- base::Bind(&DriveResourceMetadata::RefreshDirectoryOnBlockingPool,
+ base::Bind(&ResourceMetadata::RefreshDirectoryOnBlockingPool,
base::Unretained(this),
directory_fetch_info,
entry_proto_map),
callback);
}
-void DriveResourceMetadata::GetChildDirectories(
+void ResourceMetadata::GetChildDirectories(
const std::string& resource_id,
const GetChildDirectoriesCallback& changed_dirs_callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -423,24 +423,24 @@
base::PostTaskAndReplyWithResult(
blocking_task_runner_,
FROM_HERE,
- base::Bind(&DriveResourceMetadata::GetChildDirectoriesOnBlockingPool,
+ base::Bind(&ResourceMetadata::GetChildDirectoriesOnBlockingPool,
base::Unretained(this),
resource_id),
base::Bind(&RunGetChildDirectoriesCallbackWithResult,
changed_dirs_callback));
}
-void DriveResourceMetadata::RemoveAll(const base::Closure& callback) {
+void ResourceMetadata::RemoveAll(const base::Closure& callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
blocking_task_runner_->PostTaskAndReply(
FROM_HERE,
- base::Bind(&DriveResourceMetadata::RemoveAllOnBlockingPool,
+ base::Bind(&ResourceMetadata::RemoveAllOnBlockingPool,
base::Unretained(this)),
callback);
}
-void DriveResourceMetadata::IterateEntries(
+void ResourceMetadata::IterateEntries(
const IterateCallback& iterate_callback,
const base::Closure& completion_callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -449,18 +449,18 @@
blocking_task_runner_->PostTaskAndReply(
FROM_HERE,
- base::Bind(&DriveResourceMetadata::IterateEntriesOnBlockingPool,
+ base::Bind(&ResourceMetadata::IterateEntriesOnBlockingPool,
base::Unretained(this),
iterate_callback),
completion_callback);
}
-int64 DriveResourceMetadata::GetLargestChangestampOnBlockingPool() {
+int64 ResourceMetadata::GetLargestChangestampOnBlockingPool() {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
return storage_->GetLargestChangestamp();
}
-FileError DriveResourceMetadata::SetLargestChangestampOnBlockingPool(
+FileError ResourceMetadata::SetLargestChangestampOnBlockingPool(
int64 value) {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
@@ -471,7 +471,7 @@
return FILE_ERROR_OK;
}
-FileError DriveResourceMetadata::MoveEntryToDirectoryOnBlockingPool(
+FileError ResourceMetadata::MoveEntryToDirectoryOnBlockingPool(
const base::FilePath& file_path,
const base::FilePath& directory_path,
base::FilePath* out_file_path) {
@@ -494,7 +494,7 @@
return RefreshEntryOnBlockingPool(*entry, out_file_path, NULL);
}
-FileError DriveResourceMetadata::RenameEntryOnBlockingPool(
+FileError ResourceMetadata::RenameEntryOnBlockingPool(
const base::FilePath& file_path,
const std::string& new_name,
base::FilePath* out_file_path) {
@@ -518,7 +518,7 @@
return RefreshEntryOnBlockingPool(*entry, out_file_path, NULL);
}
-FileError DriveResourceMetadata::RemoveEntryOnBlockingPool(
+FileError ResourceMetadata::RemoveEntryOnBlockingPool(
const std::string& resource_id,
base::FilePath* out_file_path) {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
@@ -542,7 +542,7 @@
return FILE_ERROR_OK;
}
-scoped_ptr<DriveEntryProto> DriveResourceMetadata::FindEntryByPathSync(
+scoped_ptr<DriveEntryProto> ResourceMetadata::FindEntryByPathSync(
const base::FilePath& file_path) {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
@@ -574,7 +574,7 @@
return entry.Pass();
}
-FileError DriveResourceMetadata::GetEntryInfoByResourceIdOnBlockingPool(
+FileError ResourceMetadata::GetEntryInfoByResourceIdOnBlockingPool(
const std::string& resource_id,
base::FilePath* out_file_path,
DriveEntryProto* out_entry) {
@@ -593,7 +593,7 @@
return FILE_ERROR_OK;
}
-FileError DriveResourceMetadata::GetEntryInfoByPathOnBlockingPool(
+FileError ResourceMetadata::GetEntryInfoByPathOnBlockingPool(
const base::FilePath& path,
DriveEntryProto* out_entry) {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
@@ -607,7 +607,7 @@
return FILE_ERROR_OK;
}
-FileError DriveResourceMetadata::ReadDirectoryByPathOnBlockingPool(
+FileError ResourceMetadata::ReadDirectoryByPathOnBlockingPool(
const base::FilePath& path,
DriveEntryProtoVector* out_entries) {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
@@ -624,7 +624,7 @@
return FILE_ERROR_OK;
}
-void DriveResourceMetadata::GetEntryInfoPairByPaths(
+void ResourceMetadata::GetEntryInfoPairByPaths(
const base::FilePath& first_path,
const base::FilePath& second_path,
const GetEntryInfoPairCallback& callback) {
@@ -634,14 +634,14 @@
// Get the first entry.
GetEntryInfoByPath(
first_path,
- base::Bind(&DriveResourceMetadata::GetEntryInfoPairByPathsAfterGetFirst,
+ base::Bind(&ResourceMetadata::GetEntryInfoPairByPathsAfterGetFirst,
weak_ptr_factory_.GetWeakPtr(),
first_path,
second_path,
callback));
}
-FileError DriveResourceMetadata::RefreshEntryOnBlockingPool(
+FileError ResourceMetadata::RefreshEntryOnBlockingPool(
const DriveEntryProto& entry,
base::FilePath* out_file_path,
DriveEntryProto* out_entry) {
@@ -684,7 +684,7 @@
return FILE_ERROR_OK;
}
-FileError DriveResourceMetadata::RefreshDirectoryOnBlockingPool(
+FileError ResourceMetadata::RefreshDirectoryOnBlockingPool(
const DirectoryFetchInfo& directory_fetch_info,
const DriveEntryProtoMap& entry_proto_map,
base::FilePath* out_file_path) {
@@ -752,7 +752,7 @@
return FILE_ERROR_OK;
}
-FileError DriveResourceMetadata::AddEntryOnBlockingPool(
+FileError ResourceMetadata::AddEntryOnBlockingPool(
const DriveEntryProto& entry_proto,
base::FilePath* out_file_path) {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
@@ -779,7 +779,7 @@
return FILE_ERROR_OK;
}
-scoped_ptr<DriveEntryProto> DriveResourceMetadata::GetDirectory(
+scoped_ptr<DriveEntryProto> ResourceMetadata::GetDirectory(
const std::string& resource_id) {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
DCHECK(!resource_id.empty());
@@ -789,7 +789,7 @@
entry.Pass() : scoped_ptr<DriveEntryProto>();
}
-base::FilePath DriveResourceMetadata::GetFilePath(
+base::FilePath ResourceMetadata::GetFilePath(
const std::string& resource_id) {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
@@ -803,7 +803,7 @@
}
scoped_ptr<std::set<base::FilePath> >
-DriveResourceMetadata::GetChildDirectoriesOnBlockingPool(
+ResourceMetadata::GetChildDirectoriesOnBlockingPool(
const std::string& resource_id) {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
@@ -816,7 +816,7 @@
return changed_directories.Pass();
}
-void DriveResourceMetadata::GetDescendantDirectoryPaths(
+void ResourceMetadata::GetDescendantDirectoryPaths(
const std::string& directory_resource_id,
std::set<base::FilePath>* child_directories) {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
@@ -833,7 +833,7 @@
}
}
-void DriveResourceMetadata::RemoveAllOnBlockingPool() {
+void ResourceMetadata::RemoveAllOnBlockingPool() {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
// TODO(hashimoto): Return FILE_ERROR_NO_SPACE here.
@@ -846,7 +846,7 @@
SetUpDefaultEntries();
}
-void DriveResourceMetadata::IterateEntriesOnBlockingPool(
+void ResourceMetadata::IterateEntriesOnBlockingPool(
const IterateCallback& callback) {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
DCHECK(!callback.is_null());
@@ -854,7 +854,7 @@
storage_->Iterate(callback);
}
-void DriveResourceMetadata::GetEntryInfoPairByPathsAfterGetFirst(
+void ResourceMetadata::GetEntryInfoPairByPathsAfterGetFirst(
const base::FilePath& first_path,
const base::FilePath& second_path,
const GetEntryInfoPairCallback& callback,
@@ -877,14 +877,14 @@
// Get the second entry.
GetEntryInfoByPath(
second_path,
- base::Bind(&DriveResourceMetadata::GetEntryInfoPairByPathsAfterGetSecond,
+ base::Bind(&ResourceMetadata::GetEntryInfoPairByPathsAfterGetSecond,
weak_ptr_factory_.GetWeakPtr(),
second_path,
callback,
base::Passed(&result)));
}
-void DriveResourceMetadata::GetEntryInfoPairByPathsAfterGetSecond(
+void ResourceMetadata::GetEntryInfoPairByPathsAfterGetSecond(
const base::FilePath& second_path,
const GetEntryInfoPairCallback& callback,
scoped_ptr<EntryInfoPairResult> result,
@@ -901,7 +901,7 @@
callback.Run(result.Pass());
}
-bool DriveResourceMetadata::PutEntryUnderDirectory(
+bool ResourceMetadata::PutEntryUnderDirectory(
const DriveEntryProto& entry) {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
@@ -934,7 +934,7 @@
return storage_->PutEntry(updated_entry);
}
-bool DriveResourceMetadata::RemoveEntryRecursively(
+bool ResourceMetadata::RemoveEntryRecursively(
const std::string& resource_id) {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
@@ -953,7 +953,7 @@
}
scoped_ptr<DriveEntryProtoVector>
-DriveResourceMetadata::DirectoryChildrenToProtoVector(
+ResourceMetadata::DirectoryChildrenToProtoVector(
const std::string& directory_resource_id) {
DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
diff --git a/chrome/browser/chromeos/drive/drive_resource_metadata.h b/chrome/browser/chromeos/drive/resource_metadata.h
similarity index 97%
rename from chrome/browser/chromeos/drive/drive_resource_metadata.h
rename to chrome/browser/chromeos/drive/resource_metadata.h
index 631494d..57270ea 100644
--- a/chrome/browser/chromeos/drive/drive_resource_metadata.h
+++ b/chrome/browser/chromeos/drive/resource_metadata.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_RESOURCE_METADATA_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_RESOURCE_METADATA_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_RESOURCE_METADATA_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_RESOURCE_METADATA_H_
#include <map>
#include <set>
@@ -125,10 +125,10 @@
GetEntryInfoPairCallback;
// Storage for Drive Metadata.
-class DriveResourceMetadata {
+class ResourceMetadata {
public:
// |root_resource_id| is the resource id for the root directory.
- DriveResourceMetadata(
+ ResourceMetadata(
const base::FilePath& data_directory_path,
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner);
@@ -232,7 +232,7 @@
private:
// Note: Use Destroy() to delete this object.
- ~DriveResourceMetadata();
+ ~ResourceMetadata();
// Used to implement Initialize();
FileError InitializeOnBlockingPool() WARN_UNUSED_RESULT;
@@ -363,11 +363,11 @@
// This should remain the last member so it'll be destroyed first and
// invalidate its weak pointers before other members are destroyed.
- base::WeakPtrFactory<DriveResourceMetadata> weak_ptr_factory_;
+ base::WeakPtrFactory<ResourceMetadata> weak_ptr_factory_;
- DISALLOW_COPY_AND_ASSIGN(DriveResourceMetadata);
+ DISALLOW_COPY_AND_ASSIGN(ResourceMetadata);
};
} // namespace drive
-#endif // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_RESOURCE_METADATA_H_
+#endif // CHROME_BROWSER_CHROMEOS_DRIVE_RESOURCE_METADATA_H_
diff --git a/chrome/browser/chromeos/drive/resource_metadata_storage.cc b/chrome/browser/chromeos/drive/resource_metadata_storage.cc
index b1f3fc9..b9924165 100644
--- a/chrome/browser/chromeos/drive/resource_metadata_storage.cc
+++ b/chrome/browser/chromeos/drive/resource_metadata_storage.cc
@@ -99,7 +99,7 @@
resource_map_.reset(db);
// Check the validity of existing DB.
- scoped_ptr<DriveResourceMetadataHeader> header = GetHeader();
+ scoped_ptr<ResourceMetadataHeader> header = GetHeader();
if (!header || header->version() != kDBVersion) {
open_existing_result = DB_INIT_INCOMPATIBLE;
LOG(INFO) << "Reject incompatible DB.";
@@ -134,7 +134,7 @@
resource_map_.reset(db);
// Set up header.
- DriveResourceMetadataHeader header;
+ ResourceMetadataHeader header;
header.set_version(kDBVersion);
PutHeader(header);
} else {
@@ -153,7 +153,7 @@
int64 largest_changestamp) {
base::ThreadRestrictions::AssertIOAllowed();
- scoped_ptr<DriveResourceMetadataHeader> header = GetHeader();
+ scoped_ptr<ResourceMetadataHeader> header = GetHeader();
DCHECK(header);
header->set_largest_changestamp(largest_changestamp);
PutHeader(*header);
@@ -161,7 +161,7 @@
int64 ResourceMetadataStorage::GetLargestChangestamp() {
base::ThreadRestrictions::AssertIOAllowed();
- scoped_ptr<DriveResourceMetadataHeader> header = GetHeader();
+ scoped_ptr<ResourceMetadataHeader> header = GetHeader();
DCHECK(header);
return header->largest_changestamp();
}
@@ -303,7 +303,7 @@
}
void ResourceMetadataStorage::PutHeader(
- const DriveResourceMetadataHeader& header) {
+ const ResourceMetadataHeader& header) {
base::ThreadRestrictions::AssertIOAllowed();
std::string serialized_header;
@@ -319,7 +319,7 @@
DCHECK(status.ok());
}
-scoped_ptr<DriveResourceMetadataHeader>
+scoped_ptr<ResourceMetadataHeader>
ResourceMetadataStorage::GetHeader() {
base::ThreadRestrictions::AssertIOAllowed();
@@ -329,12 +329,12 @@
leveldb::Slice(GetHeaderDBKey()),
&serialized_header);
if (!status.ok())
- return scoped_ptr<DriveResourceMetadataHeader>();
+ return scoped_ptr<ResourceMetadataHeader>();
- scoped_ptr<DriveResourceMetadataHeader> header(
- new DriveResourceMetadataHeader);
+ scoped_ptr<ResourceMetadataHeader> header(
+ new ResourceMetadataHeader);
if (!header->ParseFromString(serialized_header))
- return scoped_ptr<DriveResourceMetadataHeader>();
+ return scoped_ptr<ResourceMetadataHeader>();
return header.Pass();
}
@@ -349,7 +349,7 @@
it->SeekToFirst();
// Check the header.
- DriveResourceMetadataHeader header;
+ ResourceMetadataHeader header;
if (!it->Valid() ||
it->key() != GetHeaderDBKey() || // Header entry must come first.
!header.ParseFromArray(it->value().data(), it->value().size()) ||
diff --git a/chrome/browser/chromeos/drive/resource_metadata_storage.h b/chrome/browser/chromeos/drive/resource_metadata_storage.h
index 348d9d7..7235508e 100644
--- a/chrome/browser/chromeos/drive/resource_metadata_storage.h
+++ b/chrome/browser/chromeos/drive/resource_metadata_storage.h
@@ -20,11 +20,11 @@
namespace drive {
class DriveEntryProto;
-class DriveResourceMetadataHeader;
+class ResourceMetadataHeader;
typedef base::Callback<void(const DriveEntryProto& entry)> IterateCallback;
-// Storage for DriveResourceMetadata which is responsible to manage entry info
+// Storage for ResourceMetadata which is responsible to manage entry info
// and child-parent relationships between entries.
class ResourceMetadataStorage {
public:
@@ -72,10 +72,10 @@
const std::string& child_name);
// Puts header.
- void PutHeader(const DriveResourceMetadataHeader& header);
+ void PutHeader(const ResourceMetadataHeader& header);
// Gets header.
- scoped_ptr<DriveResourceMetadataHeader> GetHeader();
+ scoped_ptr<ResourceMetadataHeader> GetHeader();
// Checks validity of the data.
bool CheckValidity();
diff --git a/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc b/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc
index f058894..e0f6f37 100644
--- a/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc
+++ b/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc
@@ -39,7 +39,7 @@
// Overwrites |storage_|'s version.
void SetDBVersion(int version) {
- scoped_ptr<DriveResourceMetadataHeader> header = storage_->GetHeader();
+ scoped_ptr<ResourceMetadataHeader> header = storage_->GetHeader();
ASSERT_TRUE(header);
header->set_version(version);
storage_->PutHeader(*header);
diff --git a/chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc
similarity index 95%
rename from chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc
rename to chrome/browser/chromeos/drive/resource_metadata_unittest.cc
index e928fb7..38f60671 100644
--- a/chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc
+++ b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/resource_metadata.h"
#include <algorithm>
#include <string>
@@ -30,7 +30,7 @@
const char kTestRootResourceId[] = "test_root";
// The changestamp of the resource metadata used in
-// DriveResourceMetadataTest.
+// ResourceMetadataTest.
const int64 kTestChangestamp = 100;
// Returns the sorted base names from |entries|.
@@ -52,9 +52,9 @@
} // namespace
-class DriveResourceMetadataTest : public testing::Test {
+class ResourceMetadataTest : public testing::Test {
protected:
- DriveResourceMetadataTest()
+ ResourceMetadataTest()
: ui_thread_(content::BrowserThread::UI, &message_loop_) {
}
@@ -69,7 +69,7 @@
// drive/root/dir2/file8
// drive/root/dir1/dir3/file9
// drive/root/dir1/dir3/file10
- static void Init(DriveResourceMetadata* resource_metadata);
+ static void Init(ResourceMetadata* resource_metadata);
// Creates a DriveEntryProto.
static DriveEntryProto CreateDriveEntryProto(
@@ -78,7 +78,7 @@
const std::string& parent_resource_id);
// Adds a DriveEntryProto to the metadata tree. Returns true on success.
- static bool AddDriveEntryProto(DriveResourceMetadata* resource_metadata,
+ static bool AddDriveEntryProto(ResourceMetadata* resource_metadata,
int sequence_id,
bool is_directory,
const std::string& parent_resource_id);
@@ -91,8 +91,8 @@
content::BrowserThread::GetBlockingPool();
blocking_task_runner_ =
pool->GetSequencedTaskRunner(pool->GetSequenceToken());
- resource_metadata_.reset(new DriveResourceMetadata(temp_dir_.path(),
- blocking_task_runner_));
+ resource_metadata_.reset(new ResourceMetadata(temp_dir_.path(),
+ blocking_task_runner_));
Init(resource_metadata_.get());
}
@@ -130,7 +130,7 @@
base::ScopedTempDir temp_dir_;
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
- scoped_ptr<DriveResourceMetadata, test_util::DestroyHelperForTests>
+ scoped_ptr<ResourceMetadata, test_util::DestroyHelperForTests>
resource_metadata_;
private:
@@ -139,7 +139,7 @@
};
// static
-void DriveResourceMetadataTest::Init(DriveResourceMetadata* resource_metadata) {
+void ResourceMetadataTest::Init(ResourceMetadata* resource_metadata) {
FileError error = FILE_ERROR_FAILED;
resource_metadata->Initialize(
google_apis::test_util::CreateCopyResultCallback(&error));
@@ -190,7 +190,7 @@
}
// static
-DriveEntryProto DriveResourceMetadataTest::CreateDriveEntryProto(
+DriveEntryProto ResourceMetadataTest::CreateDriveEntryProto(
int sequence_id,
bool is_directory,
const std::string& parent_resource_id) {
@@ -218,8 +218,8 @@
return entry_proto;
}
-bool DriveResourceMetadataTest::AddDriveEntryProto(
- DriveResourceMetadata* resource_metadata,
+bool ResourceMetadataTest::AddDriveEntryProto(
+ ResourceMetadata* resource_metadata,
int sequence_id,
bool is_directory,
const std::string& parent_resource_id) {
@@ -236,10 +236,10 @@
return FILE_ERROR_OK == error;
}
-TEST_F(DriveResourceMetadataTest, LargestChangestamp) {
- scoped_ptr<DriveResourceMetadata, test_util::DestroyHelperForTests>
- resource_metadata(new DriveResourceMetadata(temp_dir_.path(),
- blocking_task_runner_));
+TEST_F(ResourceMetadataTest, LargestChangestamp) {
+ scoped_ptr<ResourceMetadata, test_util::DestroyHelperForTests>
+ resource_metadata(new ResourceMetadata(temp_dir_.path(),
+ blocking_task_runner_));
FileError error = FILE_ERROR_FAILED;
resource_metadata->Initialize(
google_apis::test_util::CreateCopyResultCallback(&error));
@@ -260,10 +260,10 @@
DCHECK_EQ(in_changestamp, out_changestamp);
}
-TEST_F(DriveResourceMetadataTest, GetEntryInfoByResourceId_RootDirectory) {
- scoped_ptr<DriveResourceMetadata, test_util::DestroyHelperForTests>
- resource_metadata(new DriveResourceMetadata(temp_dir_.path(),
- blocking_task_runner_));
+TEST_F(ResourceMetadataTest, GetEntryInfoByResourceId_RootDirectory) {
+ scoped_ptr<ResourceMetadata, test_util::DestroyHelperForTests>
+ resource_metadata(new ResourceMetadata(temp_dir_.path(),
+ blocking_task_runner_));
FileError error = FILE_ERROR_FAILED;
resource_metadata->Initialize(
google_apis::test_util::CreateCopyResultCallback(&error));
@@ -285,7 +285,7 @@
EXPECT_EQ("drive", entry_proto->base_name());
}
-TEST_F(DriveResourceMetadataTest, GetEntryInfoByResourceId) {
+TEST_F(ResourceMetadataTest, GetEntryInfoByResourceId) {
// Confirm that an existing file is found.
FileError error = FILE_ERROR_FAILED;
base::FilePath drive_file_path;
@@ -313,7 +313,7 @@
EXPECT_FALSE(entry_proto.get());
}
-TEST_F(DriveResourceMetadataTest, GetEntryInfoByPath) {
+TEST_F(ResourceMetadataTest, GetEntryInfoByPath) {
// Confirm that an existing file is found.
FileError error = FILE_ERROR_FAILED;
scoped_ptr<DriveEntryProto> entry_proto;
@@ -366,7 +366,7 @@
EXPECT_FALSE(entry_proto.get());
}
-TEST_F(DriveResourceMetadataTest, ReadDirectoryByPath) {
+TEST_F(ResourceMetadataTest, ReadDirectoryByPath) {
// Confirm that an existing directory is found.
FileError error = FILE_ERROR_FAILED;
scoped_ptr<DriveEntryProtoVector> entries;
@@ -404,7 +404,7 @@
EXPECT_FALSE(entries.get());
}
-TEST_F(DriveResourceMetadataTest, GetEntryInfoPairByPaths) {
+TEST_F(ResourceMetadataTest, GetEntryInfoPairByPaths) {
// Confirm that existing two files are found.
scoped_ptr<EntryInfoPairResult> pair_result;
resource_metadata_->GetEntryInfoPairByPaths(
@@ -462,7 +462,7 @@
ASSERT_FALSE(pair_result->second.proto.get());
}
-TEST_F(DriveResourceMetadataTest, RemoveEntry) {
+TEST_F(ResourceMetadataTest, RemoveEntry) {
// Make sure file9 is found.
FileError error = FILE_ERROR_FAILED;
base::FilePath drive_file_path;
@@ -546,7 +546,7 @@
EXPECT_EQ(FILE_ERROR_ACCESS_DENIED, error);
}
-TEST_F(DriveResourceMetadataTest, MoveEntryToDirectory) {
+TEST_F(ResourceMetadataTest, MoveEntryToDirectory) {
FileError error = FILE_ERROR_FAILED;
base::FilePath drive_file_path;
scoped_ptr<DriveEntryProto> entry_proto;
@@ -635,7 +635,7 @@
drive_file_path);
}
-TEST_F(DriveResourceMetadataTest, RenameEntry) {
+TEST_F(ResourceMetadataTest, RenameEntry) {
FileError error = FILE_ERROR_FAILED;
base::FilePath drive_file_path;
scoped_ptr<DriveEntryProto> entry_proto;
@@ -693,7 +693,7 @@
EXPECT_EQ(base::FilePath(), drive_file_path);
}
-TEST_F(DriveResourceMetadataTest, RefreshEntry) {
+TEST_F(ResourceMetadataTest, RefreshEntry) {
FileError error = FILE_ERROR_FAILED;
base::FilePath drive_file_path;
scoped_ptr<DriveEntryProto> entry_proto;
@@ -799,7 +799,7 @@
EXPECT_EQ(FILE_ERROR_INVALID_OPERATION, error);
}
-TEST_F(DriveResourceMetadataTest, RefreshDirectory_EmtpyMap) {
+TEST_F(ResourceMetadataTest, RefreshDirectory_EmtpyMap) {
base::FilePath kDirectoryPath(FILE_PATH_LITERAL("drive/root/dir1"));
const int64 kNewChangestamp = kTestChangestamp + 1;
@@ -849,7 +849,7 @@
ASSERT_TRUE(entries->empty());
}
-TEST_F(DriveResourceMetadataTest, RefreshDirectory_NonEmptyMap) {
+TEST_F(ResourceMetadataTest, RefreshDirectory_NonEmptyMap) {
base::FilePath kDirectoryPath(FILE_PATH_LITERAL("drive/root/dir1"));
const int64 kNewChangestamp = kTestChangestamp + 1;
@@ -990,7 +990,7 @@
ASSERT_EQ(3U, entries->size());
}
-TEST_F(DriveResourceMetadataTest, RefreshDirectory_WrongParentResourceId) {
+TEST_F(ResourceMetadataTest, RefreshDirectory_WrongParentResourceId) {
base::FilePath kDirectoryPath(FILE_PATH_LITERAL("drive/root/dir1"));
const int64 kNewChangestamp = kTestChangestamp + 1;
@@ -1027,7 +1027,7 @@
ASSERT_TRUE(entries->empty());
}
-TEST_F(DriveResourceMetadataTest, AddEntry) {
+TEST_F(ResourceMetadataTest, AddEntry) {
int sequence_id = 100;
DriveEntryProto file_entry_proto = CreateDriveEntryProto(
sequence_id++, false, "resource_id:dir3");
@@ -1078,7 +1078,7 @@
EXPECT_EQ(FILE_ERROR_EXISTS, error);
}
-TEST_F(DriveResourceMetadataTest, GetChildDirectories) {
+TEST_F(ResourceMetadataTest, GetChildDirectories) {
std::set<base::FilePath> child_directories;
// file9: not a directory, so no children.
@@ -1144,7 +1144,7 @@
"drive/root/dir2/dir101/dir102/dir105/dir106/dir107")));
}
-TEST_F(DriveResourceMetadataTest, RemoveAll) {
+TEST_F(ResourceMetadataTest, RemoveAll) {
// The grand root has "root" which is not empty.
scoped_ptr<DriveEntryProtoVector> entries;
entries = ReadDirectoryByPathSync(
@@ -1177,7 +1177,7 @@
EXPECT_TRUE(entries_in_other->empty());
}
-TEST_F(DriveResourceMetadataTest, IterateEntries) {
+TEST_F(ResourceMetadataTest, IterateEntries) {
int count = 0;
bool completed = false;
resource_metadata_->IterateEntries(
diff --git a/chrome/browser/chromeos/drive/search_metadata.cc b/chrome/browser/chromeos/drive/search_metadata.cc
index e83dfdd..7da05088e 100644
--- a/chrome/browser/chromeos/drive/search_metadata.cc
+++ b/chrome/browser/chromeos/drive/search_metadata.cc
@@ -103,7 +103,7 @@
// Helper class for searching the local resource metadata.
class SearchMetadataHelper {
public:
- SearchMetadataHelper(DriveResourceMetadata* resource_metadata,
+ SearchMetadataHelper(ResourceMetadata* resource_metadata,
const std::string& query,
int options,
int at_most_num_matches,
@@ -192,7 +192,7 @@
delete this;
}
- DriveResourceMetadata* resource_metadata_;
+ ResourceMetadata* resource_metadata_;
const std::string query_;
const int options_;
const int at_most_num_matches_;
@@ -206,7 +206,7 @@
base::WeakPtrFactory<SearchMetadataHelper> weak_ptr_factory_;
};
-void SearchMetadata(DriveResourceMetadata* resource_metadata,
+void SearchMetadata(ResourceMetadata* resource_metadata,
const std::string& query,
int options,
int at_most_num_matches,
diff --git a/chrome/browser/chromeos/drive/search_metadata.h b/chrome/browser/chromeos/drive/search_metadata.h
index 3510757c..c30465f 100644
--- a/chrome/browser/chromeos/drive/search_metadata.h
+++ b/chrome/browser/chromeos/drive/search_metadata.h
@@ -12,7 +12,7 @@
namespace drive {
-class DriveResourceMetadata;
+class ResourceMetadata;
// Searches the local resource metadata, and returns the entries
// |at_most_num_matches| that contain |query| in their base names. Search is
@@ -20,7 +20,7 @@
// on the given |options|, which is a bit-wise OR of SearchMetadataOptions.
// |callback| must not be null. Must be called on UI thread. Empty |query|
// matches any base name. i.e. returns everything.
-void SearchMetadata(DriveResourceMetadata* resource_metadata,
+void SearchMetadata(ResourceMetadata* resource_metadata,
const std::string& query,
int search_options,
int at_most_num_matches,
diff --git a/chrome/browser/chromeos/drive/search_metadata_unittest.cc b/chrome/browser/chromeos/drive/search_metadata_unittest.cc
index 842c652..6265100f 100644
--- a/chrome/browser/chromeos/drive/search_metadata_unittest.cc
+++ b/chrome/browser/chromeos/drive/search_metadata_unittest.cc
@@ -34,7 +34,7 @@
blocking_task_runner_ =
pool->GetSequencedTaskRunner(pool->GetSequenceToken());
- resource_metadata_.reset(new DriveResourceMetadata(
+ resource_metadata_.reset(new ResourceMetadata(
temp_dir_.path(),
blocking_task_runner_));
@@ -119,7 +119,7 @@
content::TestBrowserThread ui_thread_;
base::ScopedTempDir temp_dir_;
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
- scoped_ptr<DriveResourceMetadata, test_util::DestroyHelperForTests>
+ scoped_ptr<ResourceMetadata, test_util::DestroyHelperForTests>
resource_metadata_;
};
diff --git a/chrome/browser/chromeos/drive/stale_cache_files_remover_unittest.cc b/chrome/browser/chromeos/drive/stale_cache_files_remover_unittest.cc
index 97a7d24..2b5b764 100644
--- a/chrome/browser/chromeos/drive/stale_cache_files_remover_unittest.cc
+++ b/chrome/browser/chromeos/drive/stale_cache_files_remover_unittest.cc
@@ -60,7 +60,7 @@
drive_webapps_registry_.reset(new DriveWebAppsRegistry);
- resource_metadata_.reset(new DriveResourceMetadata(
+ resource_metadata_.reset(new ResourceMetadata(
cache_->GetCacheDirectoryPath(DriveCache::CACHE_TYPE_META),
blocking_task_runner_));
@@ -105,7 +105,7 @@
scoped_ptr<google_apis::FakeDriveService> fake_drive_service_;
scoped_ptr<JobScheduler> scheduler_;
scoped_ptr<DriveWebAppsRegistry> drive_webapps_registry_;
- scoped_ptr<DriveResourceMetadata, test_util::DestroyHelperForTests>
+ scoped_ptr<ResourceMetadata, test_util::DestroyHelperForTests>
resource_metadata_;
scoped_ptr<FakeFreeDiskSpaceGetter> fake_free_disk_space_getter_;
scoped_ptr<StaleCacheFilesRemover> stale_cache_files_remover_;
diff --git a/chrome/browser/chromeos/drive/sync_client.h b/chrome/browser/chromeos/drive/sync_client.h
index 08e485f..e6c129b 100644
--- a/chrome/browser/chromeos/drive/sync_client.h
+++ b/chrome/browser/chromeos/drive/sync_client.h
@@ -12,8 +12,8 @@
#include "base/memory/weak_ptr.h"
#include "base/time.h"
#include "chrome/browser/chromeos/drive/cache_observer.h"
-#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
#include "chrome/browser/chromeos/drive/file_system_observer.h"
+#include "chrome/browser/chromeos/drive/resource_metadata.h"
namespace drive {
diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
index f620fae..3460935 100644
--- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
@@ -17,7 +17,6 @@
#include "chrome/browser/chromeos/drive/drive.pb.h"
#include "chrome/browser/chromeos/drive/drive_cache.h"
#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
-#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
#include "chrome/browser/chromeos/drive/drive_system_service.h"
#include "chrome/browser/chromeos/drive/file_system_util.h"
#include "chrome/browser/chromeos/drive/logging.h"
diff --git a/chrome/browser/ui/webui/screenshot_source.h b/chrome/browser/ui/webui/screenshot_source.h
index 42f80842..af95a173 100644
--- a/chrome/browser/ui/webui/screenshot_source.h
+++ b/chrome/browser/ui/webui/screenshot_source.h
@@ -15,7 +15,7 @@
#include "content/public/browser/url_data_source.h"
#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/resource_metadata.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/google_apis/gdata_errorcode.h"
#endif
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 95c9b61..6f30e0d 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -229,8 +229,6 @@
'browser/chromeos/drive/drive_file_system_metadata.h',
'browser/chromeos/drive/drive_protocol_handler.cc',
'browser/chromeos/drive/drive_protocol_handler.h',
- 'browser/chromeos/drive/drive_resource_metadata.cc',
- 'browser/chromeos/drive/drive_resource_metadata.h',
'browser/chromeos/drive/drive_system_service.cc',
'browser/chromeos/drive/drive_system_service.h',
'browser/chromeos/drive/drive_url_request_job.cc',
@@ -271,6 +269,8 @@
'browser/chromeos/drive/logging.cc',
'browser/chromeos/drive/resource_entry_conversion.cc',
'browser/chromeos/drive/resource_entry_conversion.h',
+ 'browser/chromeos/drive/resource_metadata.cc',
+ 'browser/chromeos/drive/resource_metadata.h',
'browser/chromeos/drive/resource_metadata_storage.cc',
'browser/chromeos/drive/resource_metadata_storage.h',
'browser/chromeos/drive/search_metadata.cc',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 2cd63f8..d6c68bd8 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -578,7 +578,6 @@
'browser/chromeos/drive/drive_cache_unittest.cc',
'browser/chromeos/drive/drive_file_stream_reader_unittest.cc',
'browser/chromeos/drive/drive_file_system_unittest.cc',
- 'browser/chromeos/drive/drive_resource_metadata_unittest.cc',
'browser/chromeos/drive/drive_system_service_unittest.cc',
'browser/chromeos/drive/drive_url_request_job_unittest.cc',
'browser/chromeos/drive/drive_webapps_registry_unittest.cc',
@@ -600,6 +599,7 @@
'browser/chromeos/drive/mock_drive_file_system.h',
'browser/chromeos/drive/resource_entry_conversion_unittest.cc',
'browser/chromeos/drive/resource_metadata_storage_unittest.cc',
+ 'browser/chromeos/drive/resource_metadata_unittest.cc',
'browser/chromeos/drive/search_metadata_unittest.cc',
'browser/chromeos/drive/stale_cache_files_remover_unittest.cc',
'browser/chromeos/drive/sync_client_unittest.cc',
