Switch to standard integer types in chrome/.

chrome/installer/gcapi/gcapi_omaha_experiment_test.cc

 // Copyright 2013 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 "chrome/installer/gcapi/gcapi_omaha_experiment.h"
 
+#include <stdint.h>
+
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/installer/gcapi/gcapi.h"
 #include "chrome/installer/gcapi/gcapi_test_registry_overrider.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "components/variations/variations_experiment_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ASCIIToUTF16;
 
 namespace {
 
 const wchar_t kBrand[] = L"ABCD";
-const uint16 kUserLevel = GCAPI_INVOKED_STANDARD_SHELL;
+const uint16_t kUserLevel = GCAPI_INVOKED_STANDARD_SHELL;
 
 const wchar_t kSomeExperiments[] = L"myexp=1|Aug 2;yourexp=2|Sep 5";
 const wchar_t kSomeOtherExperiments[] = L"anotherexp=joe|Jun 7 2008";
 const wchar_t kSomeMoreExperiments[] = L"moreexp=foo|Jul 31 1999";
 
 class GCAPIOmahaExperimentTest : public ::testing::Test {
  protected:
   GCAPIOmahaExperimentTest()
       : brand_(kBrand),
         reactivation_label_(gcapi_internals::GetGCAPIExperimentLabel(
@@ skipping 144 matching lines @@
   base::string16 expected_labels(kSomeExperiments);
   expected_labels += variations::kExperimentLabelSeparator;
   expected_labels.append(gcapi_internals::kReactivationLabel);
   expected_labels.append(kSomeOtherExperiments);
   expected_labels += variations::kExperimentLabelSeparator;
   expected_labels.append(reactivation_label_);
   VerifyExperimentLabels(expected_labels);
 }
 
 }  // namespace