gdata: Get rid of GetGDataCacheTmpDirectory() and friends

chrome/browser/chromeos/gdata/gdata_sync_client_unittest.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_sync_client.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 129 matching lines @@
 };
 
 // Action used to set mock expectations for GetFileByResourceId().
 ACTION_P4(MockGetFileByResourceId, error, local_path, mime_type, file_type) {
   arg1.Run(error, local_path, mime_type, file_type);
 }
 
 TEST_F(GDataSyncClientTest, StartInitialScan) {
   SetUpTestFiles();
 
-  EXPECT_CALL(*mock_file_system_, GetGDataCachePinnedDirectory())
+  EXPECT_CALL(*mock_file_system_, GetCacheDirectoryPath(
+      GDataRootDirectory::CACHE_TYPE_PINNED))
       .WillOnce(Return(temp_dir_.path()));
 
   sync_client_->StartInitialScan(
       base::Bind(&GDataSyncClientTest::OnInitialScanComplete,
                  base::Unretained(this)));
   // Wait until the initial scan is complete.
   message_loop_.Run();
 
   // Check the contents of the queue.
   const std::deque<std::string>& resource_ids =
@@ skipping 169 matching lines @@
   ASSERT_EQ(1U, resource_ids.size());
   EXPECT_EQ("resource_id_not_fetched_baz", resource_ids[1]);
 
   sync_client_->OnFileUnpinned("resource_id_not_fetched_baz", "md5");
   // "baz" should be gone.
   resource_ids = sync_client_->GetResourceIdsForTesting();
   ASSERT_TRUE(resource_ids.empty());
 }
 
 }  // namespace gdata