chrome/browser/google_apis/drive_api_parser_unittest.cc - Issue 18355004: google_apis: Move data files out of chrome/test/data/chromeos

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/google_apis/drive_api_parser_unittest.cc

Issue 18355004: google_apis: Move data files out of chrome/test/data/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix extension tests Created 7 years, 6 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

« no previous file with comments | « chrome/browser/google_apis/base_requests_server_unittest.cc ('k') | chrome/browser/google_apis/drive_api_requests_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/google_apis/drive_api_parser_unittest.cc

diff --git a/chrome/browser/google_apis/drive_api_parser_unittest.cc b/chrome/browser/google_apis/drive_api_parser_unittest.cc

index a823632cba791eec9c23230a11f8dcf11d19366d..60d4f35bb0acbb663c7ff75869def93bbf46024a 100644

--- a/chrome/browser/google_apis/drive_api_parser_unittest.cc

+++ b/chrome/browser/google_apis/drive_api_parser_unittest.cc

@@ -20,7 +20,7 @@ namespace google_apis {

TEST(DriveAPIParserTest, AboutResourceParser) {

std::string error;

scoped_ptr<base::Value> document = test_util::LoadJSONFile(

- "chromeos/drive/about.json");

+ "drive/about.json");

ASSERT_TRUE(document.get());

ASSERT_EQ(base::Value::TYPE_DICTIONARY, document->GetType());

@@ -56,7 +56,7 @@ TEST(DriveAPIParserTest, AboutResourceFromAccountMetadata) {

TEST(DriveAPIParserTest, AppListParser) {

std::string error;

scoped_ptr<base::Value> document = test_util::LoadJSONFile(

- "chromeos/drive/applist.json");

+ "drive/applist.json");

ASSERT_TRUE(document.get());

ASSERT_EQ(base::Value::TYPE_DICTIONARY, document->GetType());

@@ -234,7 +234,7 @@ TEST(DriveAPIParserTest, AppListFromAccountMetadata) {

TEST(DriveAPIParserTest, FileListParser) {

std::string error;

scoped_ptr<base::Value> document = test_util::LoadJSONFile(

- "chromeos/drive/filelist.json");

+ "drive/filelist.json");

ASSERT_TRUE(document.get());

ASSERT_EQ(base::Value::TYPE_DICTIONARY, document->GetType());

@@ -350,7 +350,7 @@ TEST(DriveAPIParserTest, FileListParser) {

TEST(DriveAPIParserTest, ChangeListParser) {

std::string error;

scoped_ptr<base::Value> document =

- test_util::LoadJSONFile("chromeos/drive/changelist.json");

+ test_util::LoadJSONFile("drive/changelist.json");

ASSERT_TRUE(document.get());

ASSERT_EQ(base::Value::TYPE_DICTIONARY, document->GetType());

@@ -413,9 +413,9 @@ TEST(DriveAPIParserTest, ChangeListParser) {

TEST(DriveAPIParserTest, HasKind) {

scoped_ptr<base::Value> change_list_json(

- test_util::LoadJSONFile("chromeos/drive/changelist.json"));

+ test_util::LoadJSONFile("drive/changelist.json"));

scoped_ptr<base::Value> file_list_json(

- test_util::LoadJSONFile("chromeos/drive/filelist.json"));

+ test_util::LoadJSONFile("drive/filelist.json"));

EXPECT_TRUE(ChangeList::HasChangeListKind(*change_list_json));

EXPECT_FALSE(ChangeList::HasChangeListKind(*file_list_json));