gdata: Get rid of GetGDataCacheTmpDirectory() and friends

chrome/browser/chromeos/gdata/gdata_util.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_util.h"
 
 #include <string>
 #include <vector>
 #include <utility>
 
@@ skipping 126 matching lines @@
 
 void ModifyGDataFileResourceUrl(Profile* profile,
                                 const FilePath& gdata_cache_path,
                                 GURL* url) {
   GDataFileSystem* file_system = GetGDataFileSystem(profile);
   if (!file_system)
     return;
 
   // Handle hosted documents. The edit url is in the temporary file, so we
   // read it on a blocking thread.
-  if (file_system->GetGDataTempDocumentFolderPath().IsParent(
+  if (file_system->GetCacheDirectoryPath(
+          GDataRootDirectory::CACHE_TYPE_TMP_DOCUMENTS).IsParent(
       gdata_cache_path)) {
     GURL* edit_url = new GURL();
     content::BrowserThread::GetBlockingPool()->PostTaskAndReply(FROM_HERE,
         base::Bind(&GetHostedDocumentURLBlockingThread,
                    gdata_cache_path, edit_url),
         base::Bind(&OpenEditURLUIThread, profile, base::Owned(edit_url)));
     *url = GURL();
     return;
   }
 
   // Handle all other gdata files.
-  if (file_system->GetGDataCacheTmpDirectory().IsParent(gdata_cache_path)) {
+  if (file_system->GetCacheDirectoryPath(
+          GDataRootDirectory::CACHE_TYPE_TMP).IsParent(gdata_cache_path)) {
     const std::string resource_id =
         gdata_cache_path.BaseName().RemoveExtension().AsUTF8Unsafe();
     GetFileNameDelegate delegate;
     file_system->FindEntryByResourceIdSync(resource_id, &delegate);
     *url = gdata::util::GetFileResourceUrl(resource_id, delegate.file_name());
     DVLOG(1) << "ModifyGDataFileResourceUrl " << *url;
   }
 }
 
 bool IsUnderGDataMountPoint(const FilePath& path) {
@@ skipping 84 matching lines @@
   // --disable-gdata or enterprise policy, or probably with user settings too
   // in the future.
   if (profile->GetPrefs()->GetBoolean(prefs::kDisableGData))
     return false;
 
   return true;
 }
 
 }  // namespace util
 }  // namespace gdata