Switch to standard integer types in chrome/browser/chromeos/.

chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // 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"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
 #include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/web_contents_tester.h"
 
 using content::InterstitialPage;
 using content::WebContents;
 using content::WebContentsTester;
 
 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
 
 namespace chromeos {
 
 // An MergeSessionLoadPage class that does not create windows.
 class TestMergeSessionLoadPage :  public MergeSessionLoadPage {
  public:
   TestMergeSessionLoadPage(WebContents* web_contents, const GURL& url)
       : MergeSessionLoadPage(
@@ skipping 134 matching lines @@
 
   // The URL remains to be URL2.
   EXPECT_EQ(kURL2, web_contents()->GetVisibleURL().spec());
 
   // Commit navigation and the interstitial page is gone.
   Navigate(kURL2, 2, pending_id, true);
   EXPECT_FALSE(GetMergeSessionLoadPage());
 }
 
 }  // namespace chromeos