| Index: chrome/browser/google_apis/fake_drive_service.cc
|
| diff --git a/chrome/browser/google_apis/fake_drive_service.cc b/chrome/browser/google_apis/fake_drive_service.cc
|
| index ee021776ae2f614afdc44085dc61948ad721d04e..35bc57870e12a2c56cfd3a62060656b0cc5f52dd 100644
|
| --- a/chrome/browser/google_apis/fake_drive_service.cc
|
| +++ b/chrome/browser/google_apis/fake_drive_service.cc
|
| @@ -810,8 +810,8 @@ void FakeDriveService::InitiateUploadNewFile(
|
| return;
|
| }
|
|
|
| - DictionaryValue* entry = FindEntryByResourceId(parent_resource_id);
|
| - if (!entry) {
|
| + if (parent_resource_id != GetRootResourceId() &&
|
| + !FindEntryByResourceId(parent_resource_id)) {
|
| MessageLoop::current()->PostTask(
|
| FROM_HERE,
|
| base::Bind(callback, HTTP_NOT_FOUND, GURL()));
|
| @@ -918,7 +918,7 @@ void FakeDriveService::InitiateUploadExistingFile(
|
|
|
| std::string entry_etag;
|
| entry->GetString("gd$etag", &entry_etag);
|
| - if (etag != entry_etag) {
|
| + if (!etag.empty() && etag != entry_etag) {
|
| MessageLoop::current()->PostTask(
|
| FROM_HERE,
|
| base::Bind(callback, HTTP_PRECONDITION, GURL()));
|
|
|