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

components/omnibox/browser/builtin_provider.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_OMNIBOX_BROWSER_BUILTIN_PROVIDER_H_
 #define COMPONENTS_OMNIBOX_BROWSER_BUILTIN_PROVIDER_H_
 
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_provider.h"
 
 class AutocompleteProviderClient;
 
 // This is the provider for built-in URLs, such as about:settings and
 // chrome://version.
 class BuiltinProvider : public AutocompleteProvider {
  public:
@@ skipping 13 matching lines @@
                 const base::string16& inline_completion,
                 const ACMatchClassifications& styles);
 
   AutocompleteProviderClient* client_;
   Builtins builtins_;
 
   DISALLOW_COPY_AND_ASSIGN(BuiltinProvider);
 };
 
 #endif  // COMPONENTS_OMNIBOX_BROWSER_BUILTIN_PROVIDER_H_