Remove unused code/data from DriveFileSystemTest.

chrome/browser/chromeos/drive/drive_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 "chrome/browser/chromeos/drive/drive_file_system.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 195 matching lines @@
                                    file_system_->change_list_loader(),
                                    true,  // is_delta_feed
                                    fake_drive_service_->GetRootResourceId(),
                                    root_feed_changestamp_)) {
       return false;
     }
     root_feed_changestamp_++;
     return true;
   }
 
-  void AddDirectoryFromFile(const base::FilePath& directory_path,
-                            const std::string& filename) {
-    scoped_ptr<Value> atom = google_apis::test_util::LoadJSONFile(filename);
-    ASSERT_TRUE(atom);
-    ASSERT_TRUE(atom->GetType() == Value::TYPE_DICTIONARY);
-
-    DictionaryValue* dict_value = NULL;
-    Value* entry_value = NULL;
-    ASSERT_TRUE(atom->GetAsDictionary(&dict_value));
-    ASSERT_TRUE(dict_value->Get("entry", &entry_value));
-
-    DictionaryValue* entry_dict = NULL;
-    ASSERT_TRUE(entry_value->GetAsDictionary(&entry_dict));
-
-    // Tweak entry title to match the last segment of the directory path
-    // (new directory name).
-    std::vector<base::FilePath::StringType> dir_parts;
-    directory_path.GetComponents(&dir_parts);
-    entry_dict->SetString("title.$t", dir_parts[dir_parts.size() - 1]);
-
+  DriveFileError AddDirectory(const base::FilePath& directory_path) {
     DriveFileError error = DRIVE_FILE_ERROR_FAILED;
     file_system_->CreateDirectory(
         directory_path,
         false,  // is_exclusive
         false,  // is_recursive
         google_apis::test_util::CreateCopyResultCallback(&error));
     google_apis::test_util::RunBlockingPoolTask();
-    EXPECT_EQ(DRIVE_FILE_OK, error);
+    return error;
   }
 
   bool RemoveEntry(const base::FilePath& file_path) {
     DriveFileError error = DRIVE_FILE_ERROR_FAILED;
     file_system_->Remove(
         file_path, false,
         google_apis::test_util::CreateCopyResultCallback(&error));
     google_apis::test_util::RunBlockingPoolTask();
     return error == DRIVE_FILE_OK;
   }
@@ skipping 714 matching lines @@
       "drive/root/Directory 1/Document 1 excludeDir-test.gdoc"));
   EXPECT_FALSE(EntryExists(remote_dest_file_path));
 
   // We'll add a file to the Drive root and then move to "Directory 1".
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL("drive/root"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL("drive/root/Directory 1")))))
       .Times(1);
 
-  // We'll copy a hosted document using CopyHostedDocument.
-  // ".gdoc" suffix should be stripped when copying.
-  scoped_ptr<base::Value> value =
-      google_apis::test_util::LoadJSONFile(
-          "chromeos/gdata/uploaded_document.json");
-  scoped_ptr<google_apis::ResourceEntry> resource_entry =
-      google_apis::ResourceEntry::ExtractAndParse(*value);
-
-
   // Transfer the local file to Drive.
   DriveFileError error = DRIVE_FILE_ERROR_FAILED;
   file_system_->TransferFileFromLocalToRemote(
       local_src_file_path,
       remote_dest_file_path,
       google_apis::test_util::CreateCopyResultCallback(&error));
   google_apis::test_util::RunBlockingPoolTask();
 
   EXPECT_EQ(DRIVE_FILE_OK, error);
 
@@ skipping 294 matching lines @@
   base::FilePath dest_parent_path(FILE_PATH_LITERAL("drive/root/New Folder 1"));
   base::FilePath dest_file_path(
       FILE_PATH_LITERAL("drive/root/New Folder 1/Test.log"));
   base::FilePath interim_file_path(FILE_PATH_LITERAL("drive/root/Test.log"));
 
   ASSERT_TRUE(LoadRootFeedDocument());
 
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL("drive/root"))))).Times(1);
 
-  AddDirectoryFromFile(dest_parent_path,
-                       "chromeos/gdata/directory_entry_atom.json");
+  EXPECT_EQ(DRIVE_FILE_OK, AddDirectory(dest_parent_path));
 
   ASSERT_TRUE(EntryExists(src_file_path));
   scoped_ptr<DriveEntryProto> src_entry_proto = GetEntryInfoByPathSync(
       src_file_path);
   ASSERT_TRUE(src_entry_proto);
   std::string src_file_resource_id =
       src_entry_proto->resource_id();
   EXPECT_FALSE(src_entry_proto->edit_url().empty());
 
   ASSERT_TRUE(EntryExists(src_parent_path));
@@ skipping 179 matching lines @@
 
 TEST_F(DriveFileSystemTest, CreateDirectory) {
   ASSERT_TRUE(LoadRootFeedDocument());
 
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL("drive/root"))))).Times(1);
 
   // Create directory in root.
   base::FilePath dir_path(FILE_PATH_LITERAL("drive/root/New Folder 1"));
   EXPECT_FALSE(EntryExists(dir_path));
-  AddDirectoryFromFile(dir_path, "chromeos/gdata/directory_entry_atom.json");
+  EXPECT_EQ(DRIVE_FILE_OK, AddDirectory(dir_path));
   EXPECT_TRUE(EntryExists(dir_path));
 
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL("drive/root/New Folder 1")))))
       .Times(1);
 
   // Create directory in a sub directory.
   base::FilePath subdir_path(
       FILE_PATH_LITERAL("drive/root/New Folder 1/New Folder 2"));
   EXPECT_FALSE(EntryExists(subdir_path));
-  AddDirectoryFromFile(subdir_path,
-                       "chromeos/gdata/directory_entry_atom2.json");
+  EXPECT_EQ(DRIVE_FILE_OK, AddDirectory(subdir_path));
   EXPECT_TRUE(EntryExists(subdir_path));
 }
 
-// Create a directory through the document service
-TEST_F(DriveFileSystemTest, CreateDirectoryWithService) {
-  ASSERT_TRUE(LoadRootFeedDocument());
-  EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(base::FilePath(FILE_PATH_LITERAL("drive/root"))))).Times(1);
-
-  DriveFileError error = DRIVE_FILE_ERROR_FAILED;
-  file_system_->CreateDirectory(
-      base::FilePath(FILE_PATH_LITERAL("drive/root/Sample Directory Title")),
-      false,  // is_exclusive
-      true,  // is_recursive
-      google_apis::test_util::CreateCopyResultCallback(&error));
-  google_apis::test_util::RunBlockingPoolTask();
-
-  EXPECT_EQ(DRIVE_FILE_OK, error);
-}
-
 TEST_F(DriveFileSystemTest, PinAndUnpin) {
   ASSERT_TRUE(LoadRootFeedDocument());
 
   base::FilePath file_path(FILE_PATH_LITERAL("drive/root/File 1.txt"));
 
   // Get the file info.
   scoped_ptr<DriveEntryProto> entry(GetEntryInfoByPathSync(file_path));
   ASSERT_TRUE(entry);
 
   // Pin the file.
@@ skipping 618 matching lines @@
 
   // An app for foo.exe should now be found, as the registry was loaded.
   drive_webapps_registry_->GetWebAppsForFile(
       base::FilePath(FILE_PATH_LITERAL("foo.exe")),
       "" /* mime_type */,
       &apps);
   EXPECT_EQ(1U, apps.size());
 }
 
 }   // namespace drive