Switch to standard integer types in chrome/browser/, part 3 of 4.

chrome/browser/sessions/session_restore_test_helper.h

 // Copyright 2015 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.
 
 #ifndef CHROME_BROWSER_SESSIONS_SESSION_RESTORE_TEST_HELPER_H_
 #define CHROME_BROWSER_SESSIONS_SESSION_RESTORE_TEST_HELPER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/sessions/session_restore.h"
 
 namespace content {
 class MessageLoopRunner;
 }
 
 // This class waits on the SessionRestore notification. It is a replacement for
 // content::WindowedNotificationObserver, which uses notification service. This
@@ skipping 22 matching lines @@
   // For automatically unsubscribing from callback-based notifications.
   SessionRestore::CallbackSubscription callback_subscription_;
 
   // For safely binding pointers to callbacks.
   base::WeakPtrFactory<SessionRestoreTestHelper> weak_ptr_factory;
 
   DISALLOW_COPY_AND_ASSIGN(SessionRestoreTestHelper);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_SESSION_RESTORE_TEST_HELPER_H_