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

components/search_engines/keyword_web_data_service.h

 // 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.
 
 #ifndef COMPONENTS_SEARCH_ENGINES_KEYWORD_WEB_DATA_SERVICE_H__
 #define COMPONENTS_SEARCH_ENGINES_KEYWORD_WEB_DATA_SERVICE_H__
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "components/search_engines/keyword_table.h"
 #include "components/search_engines/template_url_id.h"
 #include "components/webdata/common/web_data_service_base.h"
 #include "components/webdata/common/web_database.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 class WDTypedResult;
 class WebDatabaseService;
 struct TemplateURLData;
 
 struct WDKeywordsResult {
   WDKeywordsResult();
   ~WDKeywordsResult();
 
   KeywordTable::Keywords keywords;
   // Identifies the ID of the TemplateURL that is the default search. A value of
   // 0 indicates there is no default search provider.
-  int64 default_search_provider_id;
+  int64_t default_search_provider_id;
   // Version of the built-in keywords. A value of 0 indicates a first run.
   int builtin_keyword_version;
 };
 
 class WebDataServiceConsumer;
 
 class KeywordWebDataService : public WebDataServiceBase {
  public:
   // Instantiate this to turn on batch mode on the provided |service|
   // until the scoper is destroyed.  When batch mode is on, calls to any of the
@@ skipping 61 matching lines @@
                                                     WebDatabase* db);
   WebDatabase::State SetBuiltinKeywordVersionImpl(int version, WebDatabase* db);
 
   size_t batch_mode_level_;
   KeywordTable::Operations queued_keyword_operations_;
 
   DISALLOW_COPY_AND_ASSIGN(KeywordWebDataService);
 };
 
 #endif  // COMPONENTS_SEARCH_ENGINES_KEYWORD_WEB_DATA_SERVICE_H__