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

chrome/browser/chromeos/gdata/gdata_file_system.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_
 
 #include <sys/stat.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/platform_file.h"
+#include "base/scoped_temp_dir.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/chromeos/gdata/gdata_files.h"
 #include "chrome/browser/chromeos/gdata/gdata_operation_registry.h"
 #include "chrome/browser/chromeos/gdata/gdata_params.h"
 #include "chrome/browser/chromeos/gdata/gdata_parser.h"
 #include "chrome/browser/chromeos/gdata/gdata_uploader.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
 
 namespace base {
@@ skipping 312 matching lines @@
   virtual FilePath GetGDataTempDownloadFolderPath() const = 0;
 
   // Returns the pinned sub-directory under gdata cache directory, i.e.
   // <user_profile_dir>/GCache/v1/pinned
   virtual FilePath GetGDataCachePinnedDirectory() const = 0;
 
   // Returns the pinned sub-directory under gdata cache directory, i.e.
   // <user_profile_dir>/GCache/v1/pinned
   virtual FilePath GetGDataCachePersistentDirectory() const = 0;
 
+  // Returns the directory for hosting temporary document JSON files, i.e.
+  // <system_temp_dir>/<unique_temp_dir>
+  virtual FilePath GetGDataTempDocumentDirectory() const = 0;
+
   // Returns absolute path of the file if it were cached or to be cached.
   virtual FilePath GetCacheFilePath(
       const std::string& resource_id,
       const std::string& md5,
       GDataRootDirectory::CacheSubDirectoryType sub_dir_type,
       CachedFileOrigin file_orign) const = 0;
 
   // Fetches the user's Account Metadata to find out current quota information
   // and returns it to the callback.
   virtual void GetAvailableSpace(const GetAvailableSpaceCallback& callback) = 0;
@@ skipping 57 matching lines @@
       GDataOperationRegistry::Observer* observer) OVERRIDE;
   virtual void GetCacheState(const std::string& resource_id,
                              const std::string& md5,
                              const GetCacheStateCallback& callback) OVERRIDE;
   virtual bool GetFileInfoFromPath(const FilePath& gdata_file_path,
                                    GDataFileProperties* properties) OVERRIDE;
   virtual FilePath GetGDataCacheTmpDirectory() const OVERRIDE;
   virtual FilePath GetGDataTempDownloadFolderPath() const OVERRIDE;
   virtual FilePath GetGDataCachePinnedDirectory() const OVERRIDE;
   virtual FilePath GetGDataCachePersistentDirectory() const OVERRIDE;
+  virtual FilePath GetGDataTempDocumentDirectory() const OVERRIDE;
   virtual FilePath GetCacheFilePath(
       const std::string& resource_id,
       const std::string& md5,
       GDataRootDirectory::CacheSubDirectoryType sub_dir_type,
       CachedFileOrigin file_orign) const OVERRIDE;
   virtual void GetAvailableSpace(
       const GetAvailableSpaceCallback& callback) OVERRIDE;
   virtual void AddUploadedFile(const FilePath& virtual_dir_path,
                                DocumentEntry* entry,
                                const FilePath& file_content_path,
@@ skipping 139 matching lines @@
   void UnsafeFindFileByPath(const FilePath& file_path,
                             FindFileDelegate* delegate);
 
   // Converts document feed from gdata service into DirectoryInfo. On failure,
   // returns NULL and fills in |error| with an appropriate value.
   GDataDirectory* ParseGDataFeed(GDataErrorCode status,
                                  base::Value* data,
                                  base::PlatformFileError *error);
 
   // Creates a temporary JSON file representing a document with |edit_url|
-  // and |resource_id| on IO thread pool. Upon completion it will invoke
-  // |callback| with the path of the created temporary file on thread
-  // represented by |relay_proxy|.
+  // and |resource_id| under |document_dir| on IO thread pool. Upon completion
+  // it will invoke |callback| with the path of the created temporary file on
+  // thread represented by |relay_proxy|.
   static void CreateDocumentJsonFileOnIOThreadPool(
+      const FilePath& document_dir,
       const GURL& edit_url,
       const std::string& resource_id,
       const GetFileCallback& callback,
       scoped_refptr<base::MessageLoopProxy> relay_proxy);
 
   // Renames a file or directory at |file_path| to |new_name|.
   void Rename(const FilePath& file_path,
               const FilePath::StringType& new_name,
               const FilePathUpdateCallback& callback);
 
@@ skipping 546 matching lines @@
   // The document service for the GDataFileSystem.
   scoped_ptr<DocumentsServiceInterface> documents_service_;
 
   // Base path for GData cache, e.g. <user_profile_dir>/user/GCache/v1.
   FilePath gdata_cache_path_;
 
   // Paths for all subdirectories of GCache, one for each
   // GDataRootDirectory::CacheSubDirectoryType enum.
   std::vector<FilePath> cache_paths_;
 
+  // Directory for hosting temporary document JSON files.
+  ScopedTempDir temp_document_dir_;
+
   scoped_ptr<base::WaitableEvent> on_io_completed_;
 
   // True if cache initialization has started, is in progress or has completed,
   // we only want to initialize cache once.
   bool cache_initialization_started_;
 
   // Number of pending tasks on the worker thread pool.
   int num_pending_tasks_;
   base::Lock num_pending_tasks_lock_;
 
   // WeakPtrFactory and WeakPtr bound to the UI thread.
   scoped_ptr<base::WeakPtrFactory<GDataFileSystem> > ui_weak_ptr_factory_;
   base::WeakPtr<GDataFileSystem> ui_weak_ptr_;
 
   // WeakPtrFactory bound to the IO thread. Created when needed.
   scoped_ptr<base::WeakPtrFactory<GDataFileSystem> > io_weak_ptr_factory_;
 
   ObserverList<Observer> observers_;
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_