| Index: chrome/browser/chromeos/drive/drive_resource_metadata.cc
|
| diff --git a/chrome/browser/chromeos/drive/drive_resource_metadata.cc b/chrome/browser/chromeos/drive/drive_resource_metadata.cc
|
| index fed813c86a9ea5e3b7b0bb3369958721611ce167..fa144cc24aad923dcf9736b35ec7643645aa3a07 100644
|
| --- a/chrome/browser/chromeos/drive/drive_resource_metadata.cc
|
| +++ b/chrome/browser/chromeos/drive/drive_resource_metadata.cc
|
| @@ -19,7 +19,7 @@
|
|
|
| using content::BrowserThread;
|
|
|
| -namespace gdata {
|
| +namespace drive {
|
| namespace {
|
|
|
| // m: prefix for filesystem metadata db keys, version and largest_changestamp.
|
| @@ -186,7 +186,7 @@ DriveResourceMetadata::DriveResourceMetadata()
|
| origin_(UNINITIALIZED),
|
| ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
|
| root_ = CreateDriveDirectory().Pass();
|
| - if (!util::IsDriveV2ApiEnabled())
|
| + if (!gdata::util::IsDriveV2ApiEnabled())
|
| InitializeRootEntry(kDriveRootDirectoryResourceId);
|
| }
|
|
|
| @@ -200,7 +200,7 @@ DriveResourceMetadata::~DriveResourceMetadata() {
|
| }
|
|
|
| scoped_ptr<DriveEntry> DriveResourceMetadata::FromDocumentEntry(
|
| - const DocumentEntry& doc) {
|
| + const gdata::DocumentEntry& doc) {
|
| scoped_ptr<DriveEntry> entry;
|
| if (doc.is_folder())
|
| entry = CreateDriveDirectory().Pass();
|
| @@ -243,7 +243,7 @@ void DriveResourceMetadata::ClearRoot() {
|
|
|
| void DriveResourceMetadata::AddEntryToDirectory(
|
| const FilePath& directory_path,
|
| - scoped_ptr<DocumentEntry> doc_entry,
|
| + scoped_ptr<gdata::DocumentEntry> doc_entry,
|
| const FileMoveCallback& callback) {
|
| DCHECK(!directory_path.empty());
|
| DCHECK(!callback.is_null());
|
| @@ -513,7 +513,7 @@ void DriveResourceMetadata::GetEntryInfoPairByPaths(
|
| }
|
|
|
| void DriveResourceMetadata::RefreshFile(
|
| - scoped_ptr<DocumentEntry> doc_entry,
|
| + scoped_ptr<gdata::DocumentEntry> doc_entry,
|
| const GetEntryInfoWithFilePathCallback& callback) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| DCHECK(!callback.is_null());
|
| @@ -871,4 +871,4 @@ void DriveResourceMetadata::GetEntryInfoPairByPathsAfterGetSecond(
|
| callback.Run(result.Pass());
|
| }
|
|
|
| -} // namespace gdata
|
| +} // namespace drive
|
|
|