Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(740)

Unified Diff: chrome/browser/chromeos/drive/drive_file_system_unittest.cc

Issue 12585003: drive: Add showroot=true to WAPI feed URLs and ignore "no parent" entries. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix browser_tests. Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/drive/drive_file_system_unittest.cc
diff --git a/chrome/browser/chromeos/drive/drive_file_system_unittest.cc b/chrome/browser/chromeos/drive/drive_file_system_unittest.cc
index 9aeeb96e781b7d2207efcaa61e48d7d2741f371b..792d239e8fbbba9770a8080f23960e77ce05d501 100644
--- a/chrome/browser/chromeos/drive/drive_file_system_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_file_system_unittest.cc
@@ -736,7 +736,7 @@ TEST_F(DriveFileSystemTest, ReadDirectoryByPath_Root) {
ReadDirectoryByPathSync(base::FilePath::FromUTF8Unsafe("drive")));
// The root directory should be read correctly.
ASSERT_TRUE(entries.get());
- EXPECT_EQ(9U, entries->size());
+ EXPECT_EQ(8U, entries->size());
}
TEST_F(DriveFileSystemTest, ReadDirectoryByPath_NonRootDirectory) {
@@ -1013,12 +1013,6 @@ TEST_F(DriveFileSystemTest, TransferFileFromLocalToRemote_RegularFile) {
FILE_PATH_LITERAL("drive/remote.txt"));
EXPECT_FALSE(EntryExists(remote_dest_file_path));
- scoped_ptr<base::Value> value =
- google_apis::test_util::LoadJSONFile(
- "chromeos/gdata/document_to_download.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(
« no previous file with comments | « chrome/browser/chromeos/drive/change_list_processor.cc ('k') | chrome/browser/chromeos/drive/drive_resource_metadata.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698