Switch to standard integer types in chrome/browser/, part 1 of 4.

chrome/browser/diagnostics/sqlite_diagnostics.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 "chrome/browser/diagnostics/sqlite_diagnostics.h"
 
+#include <stdint.h>
+
 #include "base/base_paths.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chromeos/chromeos_constants.h"
 #include "components/history/core/browser/history_constants.h"
 #include "components/webdata/common/webdata_constants.h"
 #include "content/public/common/content_constants.h"
 #include "sql/connection.h"
 #include "sql/statement.h"
 #include "storage/browser/database/database_tracker.h"
 #include "third_party/sqlite/sqlite3.h"
 
 namespace diagnostics {
 
 namespace {
 
 // Generic diagnostic test class for checking SQLite database integrity.
 class SqliteIntegrityTest : public DiagnosticsTest {
  public:
   // These are bit flags, so each value should be a power of two.
   enum Flags {
     NO_FLAGS_SET = 0,
     CRITICAL = 0x01,
     REMOVE_IF_CORRUPT = 0x02,
   };
 
-  SqliteIntegrityTest(uint32 flags,
+  SqliteIntegrityTest(uint32_t flags,
                       DiagnosticsTestId id,
                       const base::FilePath& db_path)
       : DiagnosticsTest(id), flags_(flags), db_path_(db_path) {}
 
   bool RecoveryImpl(DiagnosticsModel::Observer* observer) override {
     int outcome_code = GetOutcomeCode();
     if (flags_ & REMOVE_IF_CORRUPT) {
       switch (outcome_code) {
         case DIAG_SQLITE_ERROR_HANDLER_CALLED:
         case DIAG_SQLITE_CANNOT_OPEN_DB:
@@ skipping 133 matching lines @@
     ~ErrorRecorder() {}
 
     bool has_error_;
     int sqlite_error_;
     int last_errno_;
     std::string message_;
 
     DISALLOW_COPY_AND_ASSIGN(ErrorRecorder);
   };
 
-  uint32 flags_;
+  uint32_t flags_;
   base::FilePath db_path_;
   DISALLOW_COPY_AND_ASSIGN(SqliteIntegrityTest);
 };
 
 }  // namespace
 
 DiagnosticsTest* MakeSqliteCookiesDbTest() {
   return new SqliteIntegrityTest(SqliteIntegrityTest::CRITICAL,
                                  DIAGNOSTICS_SQLITE_INTEGRITY_COOKIE_TEST,
                                  base::FilePath(chrome::kCookieFilename));
@@ skipping 39 matching lines @@
                                  base::FilePath(history::kThumbnailsFilename));
 }
 
 DiagnosticsTest* MakeSqliteWebDataDbTest() {
   return new SqliteIntegrityTest(SqliteIntegrityTest::CRITICAL,
                                  DIAGNOSTICS_SQLITE_INTEGRITY_WEB_DATA_TEST,
                                  base::FilePath(kWebDataFilename));
 }
 
 }  // namespace diagnostics