Index: chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc |
diff --git a/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc b/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc |
index 622483a8d863663eea96edd2ccbae087fe7bbf97..b61f430ce810ce3dcd5fa8a46f2d8519868f844d 100644 |
--- a/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc |
+++ b/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc |
@@ -2,6 +2,9 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#include <stdint.h> |
+ |
+#include "base/macros.h" |
#include "base/run_loop.h" |
#include "base/time/time.h" |
#include "chrome/browser/chromeos/login/signin/merge_session_load_page.h" |
@@ -26,7 +29,7 @@ namespace { |
const char kURL1[] = "http://www.google.com/"; |
const char kURL2[] = "http://mail.google.com/"; |
-const int64 kSessionMergeTimeout = 60; |
+const int64_t kSessionMergeTimeout = 60; |
} // namespace |