summaryrefslogtreecommitdiffstats
path: root/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc
diff options
context:
space:
mode:
authortzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 03:55:49 +0000
committertzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 03:55:49 +0000
commitd1e47321daf1b0e929d47dced30cdd267650135b (patch)
tree08208a3f39ad9c39719f228afd35d085f14cd8b8 /chrome/browser/google_apis/gdata_wapi_parser_unittest.cc
parente3e08fdbc4ccc050b891d199596428e9bdeee651 (diff)
downloadchromium_src-d1e47321daf1b0e929d47dced30cdd267650135b.zip
chromium_src-d1e47321daf1b0e929d47dced30cdd267650135b.tar.gz
chromium_src-d1e47321daf1b0e929d47dced30cdd267650135b.tar.bz2
Add changestamp field to google_apis::DocumentEntry
TEST=existing test, GDataWapiParserTest.* BUG= Review URL: https://chromiumcodereview.appspot.com/11428046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/google_apis/gdata_wapi_parser_unittest.cc')
-rw-r--r--chrome/browser/google_apis/gdata_wapi_parser_unittest.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc
index f2aa8d4..c7decea 100644
--- a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc
+++ b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc
@@ -54,9 +54,8 @@ 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)
+// TODO(nhiroki): Move json files to out of 'chromeos' directory
+// (http://crbug.com/149788).
// Test document feed parsing.
TEST_F(GDataWAPIParserTest, DocumentFeedJsonParser) {
std::string error;
@@ -161,6 +160,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 +336,6 @@ TEST_F(GDataWAPIParserTest, AccountMetadataFeedParser) {
EXPECT_EQ(1U, second_app->primary_extensions().size());
EXPECT_EQ(0U, second_app->secondary_extensions().size());
}
-#endif // OS_CHROMEOS
// Test file extension checking in DocumentEntry::HasDocumentExtension().
TEST_F(GDataWAPIParserTest, DocumentEntryHasDocumentExtension) {