Switch to standard integer types in ui/views/.

ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.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 "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 
 #include <X11/Xlib.h>
 
 // Get rid of X11 macros which conflict with gtest.
 #undef Bool
 #undef None
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/events/event_handler.h"
@@ skipping 251 matching lines @@
             widget->GetInputMethod()->GetTextInputType());
 
   widget->Deactivate();
 
   EXPECT_FALSE(widget->IsActive());
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE,
             widget->GetInputMethod()->GetTextInputType());
 }
 
 }  // namespace views