Switch to standard integer types in base/prefs/.

base/prefs/json_pref_store_unittest.cc

 // Copyright (c) 2012 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 "base/prefs/json_pref_store.h"
 
+#include <stdint.h>
+
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_filter.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 200 matching lines @@
   EXPECT_TRUE(pref_store->GetValue(kMaxTabs, &actual));
   EXPECT_TRUE(actual->GetAsInteger(&integer));
   EXPECT_EQ(10, integer);
 
   pref_store->SetValue(
       kLongIntPref,
       make_scoped_ptr(new StringValue(base::Int64ToString(214748364842LL))),
       WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   EXPECT_TRUE(pref_store->GetValue(kLongIntPref, &actual));
   EXPECT_TRUE(actual->GetAsString(&string_value));
-  int64 value;
+  int64_t value;
   base::StringToInt64(string_value, &value);
   EXPECT_EQ(214748364842LL, value);
 
   // Serialize and compare to expected output.
   ASSERT_TRUE(PathExists(golden_output_file));
   pref_store->CommitPendingWrite();
   RunLoop().RunUntilIdle();
   EXPECT_TRUE(TextContentsEqual(golden_output_file, output_file));
   ASSERT_TRUE(base::DeleteFile(output_file, false));
 }
@@ skipping 426 matching lines @@
       pref_store.get(), input_file, data_dir_.AppendASCII("write.golden.json"));
 }
 
 TEST_F(JsonPrefStoreTest, WriteCountHistogramTestBasic) {
   SimpleTestClock* test_clock = new SimpleTestClock;
   SetCurrentTimeInMinutes(0, test_clock);
   JsonPrefStore::WriteCountHistogram histogram(
       base::TimeDelta::FromSeconds(10),
       base::FilePath(FILE_PATH_LITERAL("/tmp/Local State")),
       scoped_ptr<base::Clock>(test_clock));
-  int32 report_interval =
+  int32_t report_interval =
       JsonPrefStore::WriteCountHistogram::kHistogramWriteReportIntervalMins;
 
   histogram.RecordWriteOccured();
 
   SetCurrentTimeInMinutes(1.5 * report_interval, test_clock);
   histogram.ReportOutstandingWrites();
   scoped_ptr<HistogramSamples> samples =
       histogram.GetHistogram()->SnapshotSamples();
   ASSERT_EQ(1, samples->GetCount(1));
   ASSERT_EQ(1, samples->TotalCount());
 
   ASSERT_EQ("Settings.JsonDataWriteCount.Local_State",
             histogram.GetHistogram()->histogram_name());
   ASSERT_TRUE(histogram.GetHistogram()->HasConstructionArguments(1, 30, 31));
 }
 
 TEST_F(JsonPrefStoreTest, WriteCountHistogramTestSinglePeriod) {
   SimpleTestClock* test_clock = new SimpleTestClock;
   SetCurrentTimeInMinutes(0, test_clock);
   JsonPrefStore::WriteCountHistogram histogram(
       base::TimeDelta::FromSeconds(10),
       base::FilePath(FILE_PATH_LITERAL("/tmp/Local State")),
       scoped_ptr<base::Clock>(test_clock));
-  int32 report_interval =
+  int32_t report_interval =
       JsonPrefStore::WriteCountHistogram::kHistogramWriteReportIntervalMins;
 
   histogram.RecordWriteOccured();
   SetCurrentTimeInMinutes(0.5 * report_interval, test_clock);
   histogram.RecordWriteOccured();
   SetCurrentTimeInMinutes(0.7 * report_interval, test_clock);
   histogram.RecordWriteOccured();
 
   // Nothing should be recorded until the report period has elapsed.
   scoped_ptr<HistogramSamples> samples =
@@ skipping 18 matching lines @@
   ASSERT_EQ(1, samples->TotalCount());
 }
 
 TEST_F(JsonPrefStoreTest, WriteCountHistogramTestMultiplePeriods) {
   SimpleTestClock* test_clock = new SimpleTestClock;
   SetCurrentTimeInMinutes(0, test_clock);
   JsonPrefStore::WriteCountHistogram histogram(
       base::TimeDelta::FromSeconds(10),
       base::FilePath(FILE_PATH_LITERAL("/tmp/Local State")),
       scoped_ptr<base::Clock>(test_clock));
-  int32 report_interval =
+  int32_t report_interval =
       JsonPrefStore::WriteCountHistogram::kHistogramWriteReportIntervalMins;
 
   histogram.RecordWriteOccured();
   SetCurrentTimeInMinutes(0.5 * report_interval, test_clock);
   histogram.RecordWriteOccured();
   SetCurrentTimeInMinutes(0.7 * report_interval, test_clock);
   histogram.RecordWriteOccured();
   SetCurrentTimeInMinutes(1.3 * report_interval, test_clock);
   histogram.RecordWriteOccured();
   SetCurrentTimeInMinutes(1.5 * report_interval, test_clock);
@@ skipping 18 matching lines @@
   ASSERT_EQ(3, samples->TotalCount());
 }
 
 TEST_F(JsonPrefStoreTest, WriteCountHistogramTestPeriodWithGaps) {
   SimpleTestClock* test_clock = new SimpleTestClock;
   SetCurrentTimeInMinutes(0, test_clock);
   JsonPrefStore::WriteCountHistogram histogram(
       base::TimeDelta::FromSeconds(10),
       base::FilePath(FILE_PATH_LITERAL("/tmp/Local State")),
       scoped_ptr<base::Clock>(test_clock));
-  int32 report_interval =
+  int32_t report_interval =
       JsonPrefStore::WriteCountHistogram::kHistogramWriteReportIntervalMins;
 
   // 1 write in the first period.
   histogram.RecordWriteOccured();
 
   // No writes in the second and third periods.
 
   // 2 writes in the fourth period.
   SetCurrentTimeInMinutes(3.1 * report_interval, test_clock);
   histogram.RecordWriteOccured();
@@ skipping 160 matching lines @@
   ASSERT_TRUE(file_writer->HasPendingWrite());
 
   // Call CommitPendingWrite and check that the lossy pref is there with the
   // last value set above.
   pref_store->CommitPendingWrite();
   ASSERT_FALSE(file_writer->HasPendingWrite());
   ASSERT_EQ("{\"lossy\":\"lossy\"}", GetTestFileContents());
 }
 
 }  // namespace base