Fix FakeDriveService::CopyResource.

CopyResource wrongly overwrote the original entry data.
This CL fixes it.

BUG=240160
TEST=Ran unit_tests

Review URL: https://chromiumcodereview.appspot.com/23079004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217970 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 4 deletions

diff --git a/chrome/browser/drive/fake_drive_service.cc b/chrome/browser/drive/fake_drive_service.cc
index 5fc49e3..7af31aa 100644
--- a/chrome/browser/drive/fake_drive_service.cc
+++ b/chrome/browser/drive/fake_drive_service.cc
@@ -742,9 +742,9 @@ CancelCallback FakeDriveService::CopyResource(
 
         // Reset parent directory.
         base::ListValue* links = NULL;
-        if (!entry->GetList("link", &links)) {
+        if (!copied_entry->GetList("link", &links)) {
           links = new base::ListValue;
-          entry->Set("link", links);
+          copied_entry->Set("link", links);
         }
         links->Clear();
 
diff --git a/chrome/browser/drive/fake_drive_service_unittest.cc b/chrome/browser/drive/fake_drive_service_unittest.cc
index 51fdce5..0e7ce36 100644
--- a/chrome/browser/drive/fake_drive_service_unittest.cc
+++ b/chrome/browser/drive/fake_drive_service_unittest.cc
@@ -967,7 +967,7 @@ TEST_F(FakeDriveServiceTest, CopyResource) {
   int64 old_largest_change_id = GetLargestChangeByAboutResource();
 
   const std::string kResourceId = "file:2_file_resource_id";
-  const std::string kParentResourceId = "folder:1_folder_resource_id";
+  const std::string kParentResourceId = "folder:2_folder_resource_id";
   GDataErrorCode error = GDATA_OTHER_ERROR;
   scoped_ptr<ResourceEntry> resource_entry;
   fake_service_.CopyResource(
@@ -982,7 +982,7 @@ TEST_F(FakeDriveServiceTest, CopyResource) {
   // The copied entry should have the new resource ID and the title.
   EXPECT_EQ(kResourceId + "_copied", resource_entry->resource_id());
   EXPECT_EQ("new title", resource_entry->title());
-  EXPECT_TRUE(HasParent(kResourceId, kParentResourceId));
+  EXPECT_TRUE(HasParent(resource_entry->resource_id(), kParentResourceId));
   // Should be incremented as a new hosted document was created.
   EXPECT_EQ(old_largest_change_id + 1, fake_service_.largest_changestamp());
   EXPECT_EQ(old_largest_change_id + 1, GetLargestChangeByAboutResource());