gdata: Fix issue with copying hosted documents out from Docs folder.

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 <errno.h>
 
 #include <utility>
 
@@ skipping 35 matching lines @@
 const FilePath::CharType kGDataCacheVersionDir[] = FILE_PATH_LITERAL("v1");
 const FilePath::CharType kGDataCacheMetaDir[] = FILE_PATH_LITERAL("meta");
 const FilePath::CharType kGDataCachePinnedDir[] = FILE_PATH_LITERAL("pinned");
 const FilePath::CharType kGDataCacheOutgoingDir[] =
     FILE_PATH_LITERAL("outgoing");
 const FilePath::CharType kGDataCachePersistentDir[] =
     FILE_PATH_LITERAL("persistent");
 const FilePath::CharType kGDataCacheTmpDir[] = FILE_PATH_LITERAL("tmp");
 const FilePath::CharType kGDataCacheTmpDownloadsDir[] =
     FILE_PATH_LITERAL("tmp/downloads");
+// Sub-directory, under the system temporary directory, for hosting temporary
+// document JSON file.
+const FilePath::CharType kGDataTempDocumentDir[] =
+    FILE_PATH_LITERAL("gdata_documents");
 const FilePath::CharType kLastFeedFile[] = FILE_PATH_LITERAL("last_feed.json");
 const char kGDataFileSystemToken[] = "GDataFileSystemToken";
 const FilePath::CharType kAccountMetadataFile[] =
     FILE_PATH_LITERAL("account_metadata.json");
 const FilePath::CharType kSymLinkToDevNull[] = FILE_PATH_LITERAL("/dev/null");
 
 // Converts gdata error code into file platform error code.
 base::PlatformFileError GDataToPlatformError(gdata::GDataErrorCode status) {
   switch (status) {
     case gdata::HTTP_SUCCESS:
@@ skipping 354 matching lines @@
   gdata_cache_path_ = cache_base_path.Append(chrome::kGDataCacheDirname);
   gdata_cache_path_ = gdata_cache_path_.Append(kGDataCacheVersionDir);
   // Insert into |cache_paths_| in order defined in enum CacheSubDirectoryType.
   cache_paths_.push_back(gdata_cache_path_.Append(kGDataCacheMetaDir));
   cache_paths_.push_back(gdata_cache_path_.Append(kGDataCachePinnedDir));
   cache_paths_.push_back(gdata_cache_path_.Append(kGDataCacheOutgoingDir));
   cache_paths_.push_back(gdata_cache_path_.Append(kGDataCachePersistentDir));
   cache_paths_.push_back(gdata_cache_path_.Append(kGDataCacheTmpDir));
   cache_paths_.push_back(gdata_cache_path_.Append(kGDataCacheTmpDownloadsDir));
 
+  // GetTempDir should not really fail here.
+  CHECK(file_util::GetTempDir(&temp_document_dir_));
+  temp_document_dir_ = temp_document_dir_.Append(kGDataTempDocumentDir);
+
   documents_service_->Initialize(profile_);
 
   root_.reset(new GDataRootDirectory(this));
   root_->set_file_name(kGDataRootDirectory);
 }
 
 GDataFileSystem::~GDataFileSystem() {
   // Should be deleted on IO thread by GDataSystemService.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
+  // Delete the sub-directory, under system temporary directory, for
+  // hosting temporary hosting document JSON files.
+  if (!temp_document_dir_.empty())
+    file_util::Delete(temp_document_dir_, true);

[satorux1, 2012/03/24 23:42:51]

Oh you cannot do this here. 

BrowserThread::IO is for network IO. Cannot do file IO.

[zel, 2012/03/24 23:46:29]

we can just leave this directory in place, no harm here

+
   // io_weak_ptr_factory_ must be deleted on IO thread.
   io_weak_ptr_factory_.reset();
   // documents_service_ must be deleted on IO thread, as it also owns
   // WeakPtrFactory bound to IO thread.
   documents_service_.reset();
 }
 
 void GDataFileSystem::ShutdownOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ skipping 522 matching lines @@
                  CreateDirectoryParams(
                      first_missing_path,
                      directory_path,
                      is_exclusive,
                      is_recursive,
                      callback)));
 }
 
 // static
 void GDataFileSystem::CreateDocumentJsonFileOnIOThreadPool(
+    const FilePath& document_dir,
     const GURL& edit_url,
     const std::string& resource_id,
     const GetFileCallback& callback,
     scoped_refptr<base::MessageLoopProxy> relay_proxy) {
   base::PlatformFileError error = base::PLATFORM_FILE_ERROR_FAILED;
   FilePath temp_file;
 
-  if (file_util::CreateTemporaryFile(&temp_file)) {
+  if (file_util::CreateDirectory(document_dir) &&
+      file_util::CreateTemporaryFileInDir(document_dir, &temp_file)) {
     std::string document_content = base::StringPrintf(
         "{\"url\": \"%s\", \"resource_id\": \"%s\"}",
         edit_url.spec().c_str(), resource_id.c_str());
     int document_size = static_cast<int>(document_content.size());
     if (file_util::WriteFile(temp_file, document_content.data(),
                              document_size) == document_size) {
       error = base::PLATFORM_FILE_OK;
     }
   }
 
@@ skipping 21 matching lines @@
     return;
   }
 
   // For a hosted document, we create a special JSON file to represent the
   // document instead of fetching the document content in one of the exported
   // formats. The JSON file contains the edit URL and resource ID of the
   // document.
   if (file_properties.is_hosted_document) {
     BrowserThread::PostBlockingPoolTask(FROM_HERE,
         base::Bind(&GDataFileSystem::CreateDocumentJsonFileOnIOThreadPool,
+                   temp_document_dir_,
                    file_properties.edit_url,
                    file_properties.resource_id,
                    callback,
                    base::MessageLoopProxy::current()));
     return;
   }
 
   // Returns absolute path of the file if it were cached or to be cached.
   FilePath local_tmp_path = GetCacheFilePath(file_properties.resource_id,
                                              file_properties.file_md5,
@@ skipping 191 matching lines @@
 }
 
 FilePath GDataFileSystem::GetGDataCachePinnedDirectory() const {
   return cache_paths_[GDataRootDirectory::CACHE_TYPE_PINNED];
 }
 
 FilePath GDataFileSystem::GetGDataCachePersistentDirectory() const {
   return cache_paths_[GDataRootDirectory::CACHE_TYPE_PERSISTENT];
 }
 
+FilePath GDataFileSystem::GetGDataTempDocumentDirectory() const {
+  return temp_document_dir_;
+}
+
 base::WeakPtr<GDataFileSystem> GDataFileSystem::GetWeakPtrForCurrentThread() {
   if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     return ui_weak_ptr_factory_->GetWeakPtr();
   } else if (BrowserThread::CurrentlyOn(BrowserThread::IO)) {
     if (!io_weak_ptr_factory_.get()) {
       io_weak_ptr_factory_.reset(
           new base::WeakPtrFactory<GDataFileSystem>(this));
     }
     return io_weak_ptr_factory_->GetWeakPtr();
   }
@@ skipping 2071 matching lines @@
   const bool posted = BrowserThread::PostBlockingPoolSequencedTask(
       sequence_token_name,
       from_here,
       base::Bind(&GDataFileSystem::RunTaskOnIOThreadPool,
                  base::Unretained(this),
                  task));
   DCHECK(posted);
 }
 
 }  // namespace gdata