Switch to standard integer types in components/, part 2 of 4.

components/metrics/ui/screen_info_metrics_provider_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 "components/metrics/ui/screen_info_metrics_provider.h"
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "components/metrics/proto/chrome_user_metrics_extension.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace metrics {
 
 namespace {
 
 const int kScreenWidth = 1024;
 const int kScreenHeight = 768;
@@ skipping 39 matching lines @@
   // Check that the system profile has the correct values set.
   const SystemProfileProto::Hardware& hardware =
       uma_proto.system_profile().hardware();
   EXPECT_EQ(kScreenWidth, hardware.primary_screen_width());
   EXPECT_EQ(kScreenHeight, hardware.primary_screen_height());
   EXPECT_EQ(kScreenScaleFactor, hardware.primary_screen_scale_factor());
   EXPECT_EQ(kScreenCount, hardware.screen_count());
 }
 
 }  // namespace metrics