Switch to standard integer types in ui/views/.

ui/views/controls/menu/menu_runner_unittest.cc

 // 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.
 
 #include "ui/views/controls/menu/menu_runner.h"
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/views/controls/menu/menu_delegate.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_types.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 namespace test {
@@ skipping 39 matching lines @@
   on_menu_closed_run_result_ = result;
 }
 
 class MenuRunnerTest : public ViewsTestBase {
  public:
   MenuRunnerTest();
   ~MenuRunnerTest() override;
 
   // Initializes a MenuRunner with |run_types|. It takes ownership of
   // |menu_item_view_|.
-  void InitMenuRunner(int32 run_types);
+  void InitMenuRunner(int32_t run_types);
 
   MenuItemView* menu_item_view() { return menu_item_view_; }
   TestMenuDelegate* menu_delegate() { return menu_delegate_.get(); }
   MenuRunner* menu_runner() { return menu_runner_.get(); }
   Widget* owner() { return owner_.get(); }
 
   // ViewsTestBase:
   void SetUp() override;
   void TearDown() override;
 
  private:
   // Owned by MenuRunner.
   MenuItemView* menu_item_view_;
 
   scoped_ptr<TestMenuDelegate> menu_delegate_;
   scoped_ptr<MenuRunner> menu_runner_;
   scoped_ptr<Widget> owner_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuRunnerTest);
 };
 
 MenuRunnerTest::MenuRunnerTest() {}
 
 MenuRunnerTest::~MenuRunnerTest() {}
 
-void MenuRunnerTest::InitMenuRunner(int32 run_types) {
+void MenuRunnerTest::InitMenuRunner(int32_t run_types) {
   menu_runner_.reset(new MenuRunner(menu_item_view_, run_types));
 }
 
 void MenuRunnerTest::SetUp() {
   ViewsTestBase::SetUp();
   menu_delegate_.reset(new TestMenuDelegate);
   menu_item_view_ = new MenuItemView(menu_delegate_.get());
 
   owner_.reset(new Widget);
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
@@ skipping 21 matching lines @@
   runner->Cancel();
   EXPECT_FALSE(runner->IsRunning());
   TestMenuDelegate* delegate = menu_delegate();
   EXPECT_EQ(1, delegate->on_menu_closed_called());
   EXPECT_EQ(nullptr, delegate->on_menu_closed_menu());
   EXPECT_EQ(MenuRunner::NORMAL_EXIT, delegate->on_menu_closed_run_result());
 }
 
 }  // namespace test
 }  // namespace views