Fixed remaining CL comments from review of http://codereview.chromium.org/9561009/

chrome/browser/chromeos/gdata/gdata_file_system.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/gdata/gdata_file_system.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
@@ skipping 440 matching lines @@
                                       base::PLATFORM_FILE_OK));
       }
 
       return;
     }
     case FOUND_MISSING: {
       // There is a missing folder to be created here, move on with the rest of
       // this function.
       break;
     }
+    default: {
+      NOTREACHED();
+      break;
+    }
   }
 
   // Do we have a parent directory here as well? We can't then create target
   // directory if this is not a recursive operation.
   if (directory_path !=  first_missing_path && !is_recursive) {
     if (!callback.is_null()) {
       reply_proxy->PostTask(FROM_HERE,
            base::Bind(callback, base::PLATFORM_FILE_ERROR_NOT_FOUND));
     }
     return;
@@ skipping 96 matching lines @@
   if (error != base::PLATFORM_FILE_OK) {
     if (!params.callback.is_null())
       params.proxy->PostTask(FROM_HERE, base::Bind(params.callback, error));
 
     return;
   }
 
   // Not done yet with recursive directory creation?
   if (params.target_directory_path != params.created_directory_path &&
       params.is_recursive) {
-    CreateDirectory(params.target_directory_path,
-                    params.is_exclusive,
-                    params.is_recursive,
-                    params.callback);
+    CreateDirectoryInternal(params.target_directory_path,
+                            params.is_exclusive,
+                            params.is_recursive,
+                            params.callback,
+                            params.proxy);
     return;
   }
 
   if (!params.callback.is_null()) {
     // Finally done with the create request.
     params.proxy->PostTask(FROM_HERE, base::Bind(params.callback,
                                                  base::PLATFORM_FILE_OK));
   }
 }
 
@@ skipping 143 matching lines @@
         continue;
     }
 
     GDataFileBase* file = GDataFileBase::FromDocumentEntry(dir, doc);
     if (file)
       dir->AddFile(file);
   }
   return base::PLATFORM_FILE_OK;
 }
 
-
 base::PlatformFileError GDataFileSystem::AddNewDirectory(
     const FilePath& directory_path, base::Value* entry_value) {
   if (!entry_value)
     return base::PLATFORM_FILE_ERROR_FAILED;
 
   scoped_ptr<DocumentEntry> entry(DocumentEntry::CreateFrom(entry_value));
 
   if (!entry.get())
     return base::PLATFORM_FILE_ERROR_FAILED;
 
   // We need to lock here as well (despite FindFileByPath lock) since directory
   // instance below is a 'live' object.
   base::AutoLock lock(lock_);
 
   // Find parent directory element within the cached file system snapshot.
   scoped_refptr<ReadOnlyFindFileDelegate> update_delegate(
       new ReadOnlyFindFileDelegate());
   UnsafeFindFileByPath(directory_path.DirName(), update_delegate);
 
   GDataFileBase* file = update_delegate->file();
   if (!file)
     return base::PLATFORM_FILE_ERROR_FAILED;
 
+  // Check if parent is a directory since in theory since this is a callback
+  // something could in the meantime have nuked the parent dir and created a
+  // file with the exact same name.
   GDataDirectory* parent_dir = file->AsGDataDirectory();
   if (!parent_dir)
     return base::PLATFORM_FILE_ERROR_FAILED;
 
   GDataFileBase* new_file = GDataFileBase::FromDocumentEntry(parent_dir,
                                                              entry.get());
   if (!new_file)
     return base::PLATFORM_FILE_ERROR_FAILED;
 
   parent_dir->AddFile(new_file);
@@ skipping 55 matching lines @@
 
 GDataFileSystemFactory::~GDataFileSystemFactory() {
 }
 
 ProfileKeyedService* GDataFileSystemFactory::BuildServiceInstanceFor(
     Profile* profile) const {
   return new GDataFileSystem(profile);
 }
 
 }  // namespace gdata