Switch to standard integer types in content/browser/.

content/browser/browser_side_navigation_browsertest.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 "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/shell/browser/shell.h"
@@ skipping 114 matching lines @@
 
   RenderFrameHost* initial_rfh =
       static_cast<WebContentsImpl*>(shell()->web_contents())
           ->GetFrameTree()->root()->current_frame_host();
 
   // Simulate clicking on a cross-site link.
   {
     TestNavigationObserver observer(shell()->web_contents());
     const char kReplacePortNumber[] =
       "window.domAutomationController.send(setPortNumber(%d));";
-    uint16 port_number = embedded_test_server()->port();
+    uint16_t port_number = embedded_test_server()->port();
     GURL url = embedded_test_server()->GetURL("foo.com", "/title2.html");
     bool success = false;
     EXPECT_TRUE(ExecuteScriptAndExtractBool(
         shell()->web_contents(),
         base::StringPrintf(kReplacePortNumber, port_number),
         &success));
     success = false;
     EXPECT_TRUE(ExecuteScriptAndExtractBool(
         shell()->web_contents(),
         "window.domAutomationController.send(clickCrossSiteLink());",
@@ skipping 30 matching lines @@
         base::Bind(&net::URLRequestFailedJob::AddUrlHandler));
     NavigateToURL(shell(), error_url);
     EXPECT_EQ(error_url, observer.last_navigation_url());
     NavigationEntry* entry =
         shell()->web_contents()->GetController().GetLastCommittedEntry();
     EXPECT_EQ(PAGE_TYPE_ERROR, entry->GetPageType());
   }
 }
 
 }  // namespace content