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

components/webdata/common/web_data_results.h

 // 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.
 
 #ifndef COMPONENTS_WEBDATA_COMMON_WEB_DATA_RESULTS_H_
 #define COMPONENTS_WEBDATA_COMMON_WEB_DATA_RESULTS_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/callback.h"
+#include "base/macros.h"
+#include "build/build_config.h"
 #include "components/webdata/common/webdata_export.h"
 
 class WDTypedResult;
 
 //
 // Result types for WebDataService.
 //
 typedef enum {
-  BOOL_RESULT = 1,             // WDResult<bool>
-  KEYWORDS_RESULT,             // WDResult<WDKeywordsResult>
-  INT64_RESULT,                // WDResult<int64>
+  BOOL_RESULT = 1,              // WDResult<bool>
+  KEYWORDS_RESULT,              // WDResult<WDKeywordsResult>
+  INT64_RESULT,                 // WDResult<int64_t>
 #if defined(OS_WIN)
-  PASSWORD_IE7_RESULT,         // WDResult<IE7PasswordInfo>
+  PASSWORD_IE7_RESULT,          // WDResult<IE7PasswordInfo>
 #endif
-  WEB_APP_IMAGES,              // WDResult<WDAppImagesResult>
-  TOKEN_RESULT,                // WDResult<std::vector<std::string>>
-  AUTOFILL_VALUE_RESULT,       // WDResult<std::vector<base::string16>>
-  AUTOFILL_CHANGES,            // WDResult<std::vector<AutofillChange>>
-  AUTOFILL_PROFILE_RESULT,     // WDResult<AutofillProfile>
-  AUTOFILL_PROFILES_RESULT,    // WDResult<std::vector<AutofillProfile*>>
-  AUTOFILL_CREDITCARD_RESULT,  // WDResult<CreditCard>
-  AUTOFILL_CREDITCARDS_RESULT, // WDResult<std::vector<CreditCard*>>
+  WEB_APP_IMAGES,               // WDResult<WDAppImagesResult>
+  TOKEN_RESULT,                 // WDResult<std::vector<std::string>>
+  AUTOFILL_VALUE_RESULT,        // WDResult<std::vector<base::string16>>
+  AUTOFILL_CHANGES,             // WDResult<std::vector<AutofillChange>>
+  AUTOFILL_PROFILE_RESULT,      // WDResult<AutofillProfile>
+  AUTOFILL_PROFILES_RESULT,     // WDResult<std::vector<AutofillProfile*>>
+  AUTOFILL_CREDITCARD_RESULT,   // WDResult<CreditCard>
+  AUTOFILL_CREDITCARDS_RESULT,  // WDResult<std::vector<CreditCard*>>
 } WDResultType;
 
 
 typedef base::Callback<void(const WDTypedResult*)> DestroyCallback;
 
 //
 // The top level class for a result.
 //
 class WEBDATA_EXPORT WDTypedResult {
  public:
@@ skipping 58 matching lines @@
     }
   }
 
  private:
   DestroyCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(WDDestroyableResult);
 };
 
 #endif  // COMPONENTS_WEBDATA_COMMON_WEB_DATA_RESULTS_H_