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

components/omnibox/browser/autocomplete_result.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_OMNIBOX_BROWSER_AUTOCOMPLETE_RESULT_H_
 #define COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_RESULT_H_
 
 #include <stddef.h>
 
 #include <map>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
+#include "build/build_config.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "url/gurl.h"
 
 class AutocompleteInput;
 class AutocompleteProvider;
 class TemplateURLService;
 
 // All matches from all providers for a particular query.  This also tracks
 // what the default match should be if the user doesn't manually select another
@@ skipping 153 matching lines @@
   // user's local intranet contains site "foo", and the user types "foo", we
   // default to searching for "foo" when the user may have meant to navigate
   // there.  In cases like this, the default match will point to the "search for
   // 'foo'" result, and this will contain "http://foo/".
   GURL alternate_nav_url_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteResult);
 };
 
 #endif  // COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_RESULT_H_