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

Unified Diff: chrome/browser/chromeos/drive/drive_resource_metadata_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_resource_metadata_unittest.cc
diff --git a/chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc b/chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc
index 8802278ff4f7c14fcd5fa55593d56dec1ae020b4..90d0be2db2a3b52415665dc4fb6ff1f345c98d8b 100644
--- a/chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc
@@ -930,18 +930,6 @@ TEST_F(DriveResourceMetadataTest, AddEntry) {
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive/dir1/dir3/file100"),
drive_file_path);
- // Adds to root when parent resource id is not specified.
- DriveEntryProto file_entry_proto2 = CreateDriveEntryProto(
- sequence_id++, false, "");
-
- resource_metadata_->AddEntry(
- file_entry_proto2,
- base::Bind(&test_util::CopyResultsFromFileMoveCallback,
- &error, &drive_file_path));
- google_apis::test_util::RunBlockingPoolTask();
- EXPECT_EQ(DRIVE_FILE_OK, error);
- EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive/file101"), drive_file_path);
-
// Add a directory.
DriveEntryProto dir_entry_proto = CreateDriveEntryProto(
sequence_id++, true, "resource_id:dir1");
@@ -952,7 +940,7 @@ TEST_F(DriveResourceMetadataTest, AddEntry) {
&error, &drive_file_path));
google_apis::test_util::RunBlockingPoolTask();
EXPECT_EQ(DRIVE_FILE_OK, error);
- EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive/dir1/dir102"),
+ EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive/dir1/dir101"),
drive_file_path);
// Add to an invalid parent.
« no previous file with comments | « chrome/browser/chromeos/drive/drive_resource_metadata.cc ('k') | chrome/browser/chromeos/drive/resource_entry_conversion.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698