Parent/child fixes.

chrome/browser/chromeos/gdata/gdata_file_system_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 <errno.h>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 873 matching lines @@
 
   // Creates a proto file representing a filesystem with directories:
   // gdata, gdata/Dir1, gdata/Dir1/SubDir2
   // and files
   // gdata/File1, gdata/Dir1/File2, gdata/Dir1/SubDir2/File3
   void SaveTestFileSystem() {
     GDataRootDirectoryProto root;
     GDataDirectoryProto* root_dir = root.mutable_gdata_directory();
     GDataEntryProto* file_base = root_dir->mutable_gdata_entry();
     PlatformFileInfoProto* platform_info = file_base->mutable_file_info();
-    file_base->set_file_name("gdata");
+    file_base->set_title("gdata");
     platform_info->set_is_directory(true);
 
     // gdata/File1
     GDataFileProto* file = root_dir->add_child_files();
     file_base = file->mutable_gdata_entry();
     platform_info = file_base->mutable_file_info();
-    file_base->set_file_name("File1");
+    file_base->set_title("File1");
     platform_info->set_is_directory(false);
     platform_info->set_size(1048576);
 
     // gdata/Dir1
     GDataDirectoryProto* dir1 = root_dir->add_child_directories();
     file_base = dir1->mutable_gdata_entry();
     platform_info = file_base->mutable_file_info();
-    file_base->set_file_name("Dir1");
+    file_base->set_title("Dir1");
     platform_info->set_is_directory(true);
 
     // gdata/Dir1/File2
     file = dir1->add_child_files();
     file_base = file->mutable_gdata_entry();
     platform_info = file_base->mutable_file_info();
-    file_base->set_file_name("File2");
+    file_base->set_title("File2");
     platform_info->set_is_directory(false);
     platform_info->set_size(555);
 
     // gdata/Dir1/SubDir2
     GDataDirectoryProto* dir2 = dir1->add_child_directories();
     file_base = dir2->mutable_gdata_entry();
     platform_info = file_base->mutable_file_info();
-    file_base->set_file_name("SubDir2");
+    file_base->set_title("SubDir2");
     platform_info->set_is_directory(true);
 
     // gdata/Dir1/SubDir2/File3
     file = dir2->add_child_files();
     file_base = file->mutable_gdata_entry();
     platform_info = file_base->mutable_file_info();
-    file_base->set_file_name("File3");
+    file_base->set_title("File3");
     platform_info->set_is_directory(false);
     platform_info->set_size(12345);
 
     // Write this proto out to GCache/vi/meta/file_system.pb
     std::string serialized_proto;
     ASSERT_TRUE(root.SerializeToString(&serialized_proto));
     ASSERT_TRUE(!serialized_proto.empty());
 
     FilePath cache_dir_path = profile_->GetPath().Append(
         FILE_PATH_LITERAL("GCache/v1/meta/"));
@@ skipping 434 matching lines @@
             callback_helper_->last_error_);
 
   EXPECT_EQ(src_file, FindEntry(src_file_path));
   EXPECT_EQ(src_file, FindEntryByResourceId(src_file_path_resource));
   EXPECT_EQ(dest_parent, FindEntry(dest_parent_path));
 
   EXPECT_TRUE(FindEntry(dest_file_path) == NULL);
 }
 
 TEST_F(GDataFileSystemTest, RenameFile) {
-  FilePath src_file_path(
+  const FilePath src_file_path(
       FILE_PATH_LITERAL("gdata/Directory 1/SubDirectory File 1.txt"));
-  FilePath src_parent_path(FILE_PATH_LITERAL("gdata/Directory 1"));
-  FilePath dest_file_path(FILE_PATH_LITERAL("gdata/Directory 1/Test.log"));
+  const FilePath src_parent_path(FILE_PATH_LITERAL("gdata/Directory 1"));
+  const FilePath dest_file_path(
+      FILE_PATH_LITERAL("gdata/Directory 1/Test.log"));
 
   LoadRootFeedDocument("root_feed.json");
 
-  GDataEntry* src_file = NULL;
-  EXPECT_TRUE((src_file = FindEntry(src_file_path)) != NULL);
+  GDataEntry* src_file = FindEntry(src_file_path);
+  EXPECT_TRUE(src_file != NULL);
   EXPECT_TRUE(src_file->AsGDataFile() != NULL);
   std::string src_file_resource = src_file->AsGDataFile()->resource_id();
   EXPECT_EQ(src_file, FindEntryByResourceId(src_file_resource));
 
   EXPECT_CALL(*mock_doc_service_,
               RenameResource(src_file->edit_url(),
                              FILE_PATH_LITERAL("Test.log"), _));
 
   FileOperationCallback callback =
       base::Bind(&CallbackHelper::FileOperationCallback,
                  callback_helper_.get());
 
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 1"))))).Times(1);
 
   file_system_->Move(src_file_path, dest_file_path, callback);
   message_loop_.RunAllPending();
   EXPECT_EQ(base::PLATFORM_FILE_OK, callback_helper_->last_error_);
 
   EXPECT_TRUE(FindEntry(src_file_path) == NULL);
 
-  GDataEntry* dest_file = NULL;
-  EXPECT_TRUE((dest_file = FindEntry(dest_file_path)) != NULL);
+  GDataEntry* dest_file = FindEntry(dest_file_path);
+  EXPECT_TRUE(dest_file != NULL);
   EXPECT_EQ(dest_file, FindEntryByResourceId(src_file_resource));
   EXPECT_EQ(src_file, dest_file);
 }
 
 TEST_F(GDataFileSystemTest, MoveFileFromRootToSubDirectory) {
   FilePath src_file_path(FILE_PATH_LITERAL("gdata/File 1.txt"));
   FilePath dest_parent_path(FILE_PATH_LITERAL("gdata/Directory 1"));
   FilePath dest_file_path(FILE_PATH_LITERAL("gdata/Directory 1/Test.log"));
 
   LoadRootFeedDocument("root_feed.json");
@@ skipping 1526 matching lines @@
   EXPECT_EQ(1, num_callback_invocations_);
   EXPECT_TRUE(CacheEntryExists(resource_id, md5));
 
   // Try to remove the file.
   num_callback_invocations_ = 0;
   TestRemoveFromCache(resource_id, base::PLATFORM_FILE_OK);
   EXPECT_EQ(1, num_callback_invocations_);
 }
 
 }   // namespace gdata