Chromium Code Reviews| Index: chrome/browser/google_apis/gdata_wapi_parser_unittest.cc |
| diff --git a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc |
| index f2aa8d4c2f3276235e68509d9111e622021b7f01..36f06edd5a5820dd837e9f337c5a8c392ff7bd1a 100644 |
| --- a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc |
| +++ b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc |
| @@ -56,7 +56,7 @@ class GDataWAPIParserTest : public testing::Test { |
| // TODO(nhiroki): Make it possible to run these tests on any platforms after |
| // moving json files to out of 'chromeos' directory (http://crbug.com/149788). |
| -#if defined(OS_CHROMEOS) |
| +#if !defined(OS_ANDROID) |
|
satorux1
2012/12/03 08:12:12
Most of the tests in the file don't run on Android
tzik
2012/12/03 08:27:25
Done. Thanks!
|
| // Test document feed parsing. |
| TEST_F(GDataWAPIParserTest, DocumentFeedJsonParser) { |
| std::string error; |
| @@ -161,6 +161,7 @@ TEST_F(GDataWAPIParserTest, DocumentFeedJsonParser) { |
| file_open_with_link->href().spec()); |
| EXPECT_EQ("application/atom+xml", file_open_with_link->mime_type()); |
| EXPECT_EQ("the_app_id", file_open_with_link->app_id()); |
| + EXPECT_EQ(654321, file_entry->changestamp()); |
| const Link* file_unknown_link = file_entry->GetLinkByType(Link::LINK_UNKNOWN); |
| ASSERT_TRUE(file_unknown_link); |
| @@ -336,7 +337,7 @@ TEST_F(GDataWAPIParserTest, AccountMetadataFeedParser) { |
| EXPECT_EQ(1U, second_app->primary_extensions().size()); |
| EXPECT_EQ(0U, second_app->secondary_extensions().size()); |
| } |
| -#endif // OS_CHROMEOS |
| +#endif // OS_ANDROID |
| // Test file extension checking in DocumentEntry::HasDocumentExtension(). |
| TEST_F(GDataWAPIParserTest, DocumentEntryHasDocumentExtension) { |