| Index: content/browser/web_contents/web_contents_impl_unittest.cc
|
| diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc
|
| index b52447c905d23e159a5cb4e99cfd7d3bb067a4f3..eab029b6cc49f3c56aa9653ccad2bfae9f33cfbe 100644
|
| --- a/content/browser/web_contents/web_contents_impl_unittest.cc
|
| +++ b/content/browser/web_contents/web_contents_impl_unittest.cc
|
| @@ -2,9 +2,13 @@
|
| // 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/command_line.h"
|
| #include "base/logging.h"
|
| +#include "base/macros.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| +#include "build/build_config.h"
|
| #include "content/browser/frame_host/cross_site_transferring_request.h"
|
| #include "content/browser/frame_host/interstitial_page_impl.h"
|
| #include "content/browser/frame_host/navigation_entry_impl.h"
|
| @@ -1490,7 +1494,7 @@ TEST_F(WebContentsImplTest, NavigationEntryContentStateNewWindow) {
|
| NavigationEntryImpl* entry_impl =
|
| NavigationEntryImpl::FromNavigationEntry(entry);
|
| EXPECT_FALSE(entry_impl->site_instance()->HasSite());
|
| - int32 site_instance_id = entry_impl->site_instance()->GetId();
|
| + int32_t site_instance_id = entry_impl->site_instance()->GetId();
|
|
|
| // Navigating to a normal page should not cause a process swap.
|
| const GURL new_url("http://www.google.com");
|
| @@ -3189,7 +3193,8 @@ TEST_F(WebContentsImplTest, NoEarlyStop) {
|
| }
|
|
|
| TEST_F(WebContentsImplTest, MediaPowerSaveBlocking) {
|
| - // PlayerIDs are actually pointers cast to int64, so verify that both negative
|
| + // PlayerIDs are actually pointers cast to int64_t, so verify that both
|
| + // negative
|
| // and positive player ids don't blow up.
|
| const int kPlayerAudioVideoId = 15;
|
| const int kPlayerAudioOnlyId = -15;
|
|
|