summaryrefslogtreecommitdiffstats
path: root/google_apis
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-07 18:35:10 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-07 18:35:10 +0000
commit8120ab190f48accf55af503b9eda73b52fc4a8e7 (patch)
tree259a3dade283a42700bad50712e5619553a5353b /google_apis
parentd3f3189f1cd8607b376827e21355d86715ab1aac (diff)
downloadchromium_src-8120ab190f48accf55af503b9eda73b52fc4a8e7.zip
chromium_src-8120ab190f48accf55af503b9eda73b52fc4a8e7.tar.gz
chromium_src-8120ab190f48accf55af503b9eda73b52fc4a8e7.tar.bz2
Revert 262147 "Remove all uses of GG_LONGLONG and GG_ULONGLONG."
> Remove all uses of GG_LONGLONG and GG_ULONGLONG. > > 123LL and 123ULL now work everywhere. You can also use INT64_C and > UINT64_C (from <stdint.h>) in Chromium code (we force-define > __STDC_CONSTANT_MACROS). (And sometimes you can just use > static_cast<(u)int64_t>.) > > Don't remove their definitions yet, because some macros that are > multiply-defined (in an identical way) rely on them. D'oh. > > R=brettw@chromium.org > TBR=sky@chromium.org,satorux@chromium.org,vrk@chromium.org,rch@chromium.org,shess@chromium.org > > Review URL: https://codereview.chromium.org/218953003 TBR=viettrungluu@chromium.org Review URL: https://codereview.chromium.org/227743006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis')
-rw-r--r--google_apis/drive/gdata_wapi_parser_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/google_apis/drive/gdata_wapi_parser_unittest.cc b/google_apis/drive/gdata_wapi_parser_unittest.cc
index e37829e..d4d9a84 100644
--- a/google_apis/drive/gdata_wapi_parser_unittest.cc
+++ b/google_apis/drive/gdata_wapi_parser_unittest.cc
@@ -248,8 +248,8 @@ TEST(GDataWAPIParserTest, AccountMetadataParser) {
scoped_ptr<AccountMetadata> metadata(
AccountMetadata::CreateFrom(*document));
ASSERT_TRUE(metadata.get());
- EXPECT_EQ(6789012345LL, metadata->quota_bytes_used());
- EXPECT_EQ(9876543210LL, metadata->quota_bytes_total());
+ EXPECT_EQ(GG_LONGLONG(6789012345), metadata->quota_bytes_used());
+ EXPECT_EQ(GG_LONGLONG(9876543210), metadata->quota_bytes_total());
EXPECT_EQ(654321, metadata->largest_changestamp());
EXPECT_EQ(2U, metadata->installed_apps().size());
const InstalledApp* first_app = metadata->installed_apps()[0];