Replace GDataDirectory::TakeEntry with GDataDirectoryService::AddEntryToDirectory.

chrome/browser/chromeos/gdata/gdata_test_util.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_TEST_UTIL_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_TEST_UTIL_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/gdata/gdata_errorcode.h"
 #include "chrome/browser/chromeos/gdata/gdata_files.h"
 
+class FilePath;
+
 namespace gdata {
 
 class GDataEntryProto;
 class GDataCacheEntry;
 
 namespace test_util {
 
 // Runs a task posted to the blocking pool, including subquent tasks posted
 // to the UI message loop and the blocking pool.
 //
@@ skipping 15 matching lines @@
 
 // Converts |cache_state| which is a bit mask of TestGDataCacheState, to a
 // GDataCacheEntry.
 GDataCacheEntry ToCacheEntry(int cache_state);
 
 // Returns true if the cache state of the given two cache entries are equal.
 bool CacheStatesEqual(const GDataCacheEntry& a, const GDataCacheEntry& b);
 
 // Copies |error| to |output|. Used to run asynchronous functions that take
 // FileOperationCallback from tests.
-void CopyErrorCodeFromFileOperationCallback(
-    GDataFileError* output, GDataFileError error);
+void CopyErrorCodeFromFileOperationCallback(GDataFileError* output,
+                                            GDataFileError error);
+
+// Copies |error| to |output|. Used to run asynchronous functions that take
+// FileMoveCallback from tests.
+void CopyErrorCodeFromFileMoveCallback(GDataFileError* output,

[satorux1, 2012/08/09 00:26:24]

I think we should also copy the path. See my comments in the test.

[achuithb, 2012/08/09 01:41:32]

Done.

+                                       GDataFileError error,
+                                       const FilePath& updated_file_path);

[satorux1, 2012/08/09 00:26:24]

moved_file_path

[achuithb, 2012/08/09 01:41:32]

Replaced here and elsewhere.

 
 // Copies |error| and |entry_proto| to |out_error| and |out_entry_proto|
 // respectively. Used to run asynchronous functions that take
 // GetEntryInfoCallback from tests.
 void CopyResultsFromGetEntryInfoCallback(
     GDataFileError* out_error,
     scoped_ptr<GDataEntryProto>* out_entry_proto,
     GDataFileError error,
     scoped_ptr<GDataEntryProto> entry_proto);
 
 // Copies |error| and |entries| to |out_error| and |out_entries|
 // respectively. Used to run asynchronous functions that take
 // GetEntryInfoCallback from tests.
 void CopyResultsFromReadDirectoryCallback(
     GDataFileError* out_error,
     scoped_ptr<GDataEntryProtoVector>* out_entries,
     GDataFileError error,
     scoped_ptr<GDataEntryProtoVector> entries);
 
 // Copies |result| |out_result|. Used to run asynchronous functions that take
 // GetEntryInfoPairCallback from tests.
 void CopyResultsFromGetEntryInfoPairCallback(
     scoped_ptr<EntryInfoPairResult>* out_result,
     scoped_ptr<EntryInfoPairResult> result);
 
 }  // namespace test_util
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_TEST_UTIL_H_