Index: chrome/browser/chromeos/gdata/gdata_file_system.cc |
=================================================================== |
--- chrome/browser/chromeos/gdata/gdata_file_system.cc (revision 150901) |
+++ chrome/browser/chromeos/gdata/gdata_file_system.cc (working copy) |
@@ -1745,9 +1745,7 @@ |
if (error == GDATA_FILE_OK) { |
scoped_ptr<DocumentEntry> doc_entry(DocumentEntry::ExtractAndParse(*data)); |
if (doc_entry.get()) { |
- fresh_entry.reset( |
- GDataEntry::FromDocumentEntry(NULL, doc_entry.get(), |
- directory_service_.get())); |
+ fresh_entry.reset(directory_service_->FromDocumentEntry(doc_entry.get())); |
} |
if (!fresh_entry.get() || !fresh_entry->AsGDataFile()) { |
LOG(ERROR) << "Got invalid entry from server for " << params.resource_id; |
@@ -2340,8 +2338,7 @@ |
// result directory. |
for (size_t i = 0; i < feed->entries().size(); ++i) { |
DocumentEntry* doc = const_cast<DocumentEntry*>(feed->entries()[i]); |
- scoped_ptr<GDataEntry> entry( |
- GDataEntry::FromDocumentEntry(NULL, doc, directory_service_.get())); |
+ scoped_ptr<GDataEntry> entry(directory_service_->FromDocumentEntry(doc)); |
if (!entry.get()) |
continue; |
@@ -2480,8 +2477,7 @@ |
return; |
} |
- GDataEntry* entry = GDataEntry::FromDocumentEntry( |
- NULL, doc_entry.get(), directory_service_.get()); |
+ GDataEntry* entry = directory_service_->FromDocumentEntry(doc_entry.get()); |
if (!entry) { |
callback.Run(GDATA_FILE_ERROR_FAILED); |
return; |
@@ -2823,8 +2819,8 @@ |
if (!parent_dir) |
return GDATA_FILE_ERROR_FAILED; |
- GDataEntry* new_entry = GDataEntry::FromDocumentEntry( |
- NULL, doc_entry.get(), directory_service_.get()); |
+ GDataEntry* new_entry = |
+ directory_service_->FromDocumentEntry(doc_entry.get()); |
if (!new_entry) |
return GDATA_FILE_ERROR_FAILED; |
@@ -2946,8 +2942,7 @@ |
return; |
scoped_ptr<GDataEntry> new_entry( |
- GDataEntry::FromDocumentEntry( |
- NULL, entry.get(), directory_service_.get())); |
+ directory_service_->FromDocumentEntry(entry.get())); |
if (!new_entry.get()) |
return; |