Update ui/display to use primitive types as defined in stdint.h

ui/display/chromeos/output_configurator_unittest.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/display/chromeos/output_configurator.h"
 
+#include <stdint.h>
+
 #include <cmath>
 #include <cstdarg>
 #include <map>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/format_macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/chromeos/display_mode.h"
 #include "ui/display/chromeos/native_display_delegate.h"
 #include "ui/display/chromeos/test/test_display_snapshot.h"
 
@@ skipping 12 matching lines @@
 // String returned by TestNativeDisplayDelegate::GetActionsAndClear() if no
 // actions were requested.
 const char kNoActions[] = "";
 
 std::string DisplaySnapshotToString(const DisplaySnapshot& output) {
   return base::StringPrintf("id=%" PRId64, output.display_id());
 }
 
 // Returns a string describing a TestNativeDisplayDelegate::SetBackgroundColor()
 // call.
-std::string GetBackgroundAction(uint32 color_argb) {
+std::string GetBackgroundAction(uint32_t color_argb) {
   return base::StringPrintf("background(0x%x)", color_argb);
 }
 
 // Returns a string describing a TestNativeDisplayDelegate::AddOutputMode()
 // call.
 std::string GetAddOutputModeAction(const DisplaySnapshot& output,
                                    const DisplayMode* mode) {
   return base::StringPrintf("add_mode(output=%" PRId64 ",mode=%s)",
                             output.display_id(),
                             mode->ToString().c_str());
@@ skipping 148 matching lines @@
     max_configurable_pixels_ = pixels;
   }
 
   void set_hdcp_state(HDCPState state) { hdcp_state_ = state; }
 
   // OutputConfigurator::Delegate overrides:
   virtual void Initialize() OVERRIDE { log_->AppendAction(kInitXRandR); }
   virtual void GrabServer() OVERRIDE { log_->AppendAction(kGrab); }
   virtual void UngrabServer() OVERRIDE { log_->AppendAction(kUngrab); }
   virtual void SyncWithServer() OVERRIDE { log_->AppendAction(kSync); }
-  virtual void SetBackgroundColor(uint32 color_argb) OVERRIDE {
+  virtual void SetBackgroundColor(uint32_t color_argb) OVERRIDE {
     log_->AppendAction(GetBackgroundAction(color_argb));
   }
   virtual void ForceDPMSOn() OVERRIDE { log_->AppendAction(kForceDPMS); }
   virtual std::vector<DisplaySnapshot*> GetOutputs() OVERRIDE {
     return outputs_;
   }
   virtual void AddMode(const DisplaySnapshot& output,
                        const DisplayMode* mode) OVERRIDE {
     log_->AppendAction(GetAddOutputModeAction(output, mode));
   }
@@ skipping 116 matching lines @@
 
 class TestStateController : public OutputConfigurator::StateController {
  public:
   TestStateController() : state_(OUTPUT_STATE_DUAL_EXTENDED) {}
   virtual ~TestStateController() {}
 
   void set_state(OutputState state) { state_ = state; }
 
   // OutputConfigurator::StateController overrides:
   virtual OutputState GetStateForDisplayIds(
-      const std::vector<int64>& outputs) const OVERRIDE {
+      const std::vector<int64_t>& outputs) const OVERRIDE {
     return state_;
   }
-  virtual bool GetResolutionForDisplayId(int64 display_id,
+  virtual bool GetResolutionForDisplayId(int64_t display_id,

[Daniel Erat, 2014/03/27 20:33:07]

nit: not for this change, but it'd probably be nice to add a DisplayId typedef

[dnicoara, 2014/03/27 21:12:21]

OK, I'll take a look. We likely want to change ui/gfx/display* as well such that
everything aligns.

                                          gfx::Size* size) const OVERRIDE {
     return false;
   }
 
  private:
   OutputState state_;
 
   DISALLOW_COPY_AND_ASSIGN(TestStateController);
 };
 
@@ skipping 980 matching lines @@
                         gfx::Point(0,
                                    modes[0]->size().height() +
                                        OutputConfigurator::kVerticalGap))
               .c_str(),
           kUngrab,
           NULL),
       log_->GetActionsAndClear());
 }
 
 }  // namespace ui