iwyu: Cleanup in the following files:

* autofill_download.cc
* autofill_ie_toolbar_import_win.cc
* autofill_field.h
* autofill_metrics.cc
* autofill_profile.cc
* autofill_type.cc
* autofill_xml_parser.cc
* contact_info.cc
* credit_card.cc
* credit_card_field.cc
* fax_number.h
* form_field.cc

BUG=none
TEST=none

R=dhollowa@chromium.org

Review URL: http://codereview.chromium.org/6775005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79839 0039d316-1c4b-4281-b951-d872f2087c98

25 files changed, 80 insertions, 21 deletions

diff --git a/chrome/browser/autofill/address_field_unittest.cc b/chrome/browser/autofill/address_field_unittest.cc
index 50983b4..7f63a3c 100644
--- a/chrome/browser/autofill/address_field_unittest.cc
+++ b/chrome/browser/autofill/address_field_unittest.cc
@@ -6,6 +6,7 @@
 #include "base/memory/scoped_vector.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/address_field.h"
+#include "chrome/browser/autofill/autofill_field.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/form_field.h"
 
diff --git a/chrome/browser/autofill/autofill_download.cc b/chrome/browser/autofill/autofill_download.cc
index dcca2a7..ebbce44 100644
--- a/chrome/browser/autofill/autofill_download.cc
+++ b/chrome/browser/autofill/autofill_download.cc
@@ -5,17 +5,22 @@
 #include "chrome/browser/autofill/autofill_download.h"
 
 #include <algorithm>
+#include <ostream>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/stl_util-inl.h"
+#include "base/string_util.h"
 #include "chrome/browser/autofill/autofill_metrics.h"
 #include "chrome/browser/autofill/autofill_xml_parser.h"
+#include "chrome/browser/autofill/form_structure.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
+#include "googleurl/src/gurl.h"
 #include "net/http/http_response_headers.h"
+#include "third_party/libjingle/source/talk/xmllite/xmlparser.h"
 
 #define AUTO_FILL_QUERY_SERVER_REQUEST_URL \
     "http://toolbarqueries.clients.google.com:80/tbproxy/af/query"
@@ -290,7 +295,7 @@ void AutofillDownloadManager::OnURLFetchComplete(
                             AUTO_FILL_QUERY_SERVER_NAME_START_IN_HEADER,
                             false) != 0)
           break;
-        // Bad getaway was received from Autofill servers. Fall through to back
+        // Bad gateway was received from Autofill servers. Fall through to back
         // off.
       case kHttpInternalServerError:
       case kHttpServiceUnavailable:
diff --git a/chrome/browser/autofill/autofill_download.h b/chrome/browser/autofill/autofill_download.h
index 65c9206..b019495 100644
--- a/chrome/browser/autofill/autofill_download.h
+++ b/chrome/browser/autofill/autofill_download.h
@@ -6,21 +6,26 @@
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_DOWNLOAD_H_
 #pragma once
 
+#include <stddef.h>
 #include <list>
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/memory/scoped_vector.h"
 #include "base/time.h"
-#include "chrome/browser/autofill/autofill_profile.h"
-#include "chrome/browser/autofill/field_types.h"
-#include "chrome/browser/autofill/form_structure.h"
 #include "chrome/common/net/url_fetcher.h"
 
 class AutofillMetrics;
+class FormStructure;
+class GURL;
 class Profile;
 
+namespace net {
+class URLRequestStatus;
+}
+
 // Handles getting and updating Autofill heuristics.
 class AutofillDownloadManager : public URLFetcher::Delegate {
  public:
diff --git a/chrome/browser/autofill/autofill_download_unittest.cc b/chrome/browser/autofill/autofill_download_unittest.cc
index 7878aa7..7f3785a 100644
--- a/chrome/browser/autofill/autofill_download_unittest.cc
+++ b/chrome/browser/autofill/autofill_download_unittest.cc
@@ -8,7 +8,9 @@
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_download.h"
+#include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/autofill_metrics.h"
+#include "chrome/browser/autofill/form_structure.h"
 #include "chrome/common/net/test_url_fetcher_factory.h"
 #include "chrome/test/test_url_request_context_getter.h"
 #include "chrome/test/testing_browser_process.h"
diff --git a/chrome/browser/autofill/autofill_field.h b/chrome/browser/autofill/autofill_field.h
index f1000a0..a875c99 100644
--- a/chrome/browser/autofill/autofill_field.h
+++ b/chrome/browser/autofill/autofill_field.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/basictypes.h"
 #include "base/string16.h"
 #include "chrome/browser/autofill/field_types.h"
 #include "webkit/glue/form_field.h"
diff --git a/chrome/browser/autofill/autofill_ie_toolbar_import_win.cc b/chrome/browser/autofill/autofill_ie_toolbar_import_win.cc
index 3ed1cf1..fc8ee17d 100644
--- a/chrome/browser/autofill/autofill_ie_toolbar_import_win.cc
+++ b/chrome/browser/autofill/autofill_ie_toolbar_import_win.cc
@@ -4,13 +4,20 @@
 
 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h"
 
+#include <stddef.h>
+#include <map>
+#include <string>
+#include <vector>
+
 #include "base/basictypes.h"
+#include "base/logging.h"
 #include "base/string16.h"
 #include "base/win/registry.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/crypto/rc4_decryptor.h"
 #include "chrome/browser/autofill/field_types.h"
+#include "chrome/browser/autofill/form_group.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/sync/util/data_encryption.h"
 
@@ -30,7 +37,7 @@ const wchar_t* const kPasswordHashValue = L"password_hash";
 const wchar_t* const kSaltValue = L"salt";
 
 // This is RC4 decryption for Toolbar credit card data. This is necessary
-// because it is not standard, so Crypto api cannot be used.
+// because it is not standard, so Crypto API cannot be used.
 std::wstring DecryptCCNumber(const std::wstring& data) {
   const wchar_t* kEmptyKey =
     L"\x3605\xCEE5\xCE49\x44F7\xCF4E\xF6CC\x604B\xFCBE\xC70A\x08FD";
diff --git a/chrome/browser/autofill/autofill_ie_toolbar_import_win.h b/chrome/browser/autofill/autofill_ie_toolbar_import_win.h
index b38da9c..ec1044b 100644
--- a/chrome/browser/autofill/autofill_ie_toolbar_import_win.h
+++ b/chrome/browser/autofill/autofill_ie_toolbar_import_win.h
@@ -1,12 +1,10 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 CHROME_BROWSER_AUTOFILL_AUTOFILL_IE_TOOLBAR_IMPORT_WIN_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_IE_TOOLBAR_IMPORT_WIN_H_
 
-#include <vector>
-
 // This importer is here and not in chrome/browser/importer/toolbar_importer.cc
 // because of the following:
 // 1. The data is not saved in profile, but rather in registry, thus it is
@@ -20,4 +18,3 @@ class PersonalDataManager;
 bool ImportAutofillDataWin(PersonalDataManager* pdm);
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_IE_TOOLBAR_IMPORT_WIN_H_
-
diff --git a/chrome/browser/autofill/autofill_metrics.cc b/chrome/browser/autofill/autofill_metrics.cc
index ebd4fd8..05d2ad9 100644
--- a/chrome/browser/autofill/autofill_metrics.cc
+++ b/chrome/browser/autofill/autofill_metrics.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/autofill/autofill_metrics.h"
 
+#include "base/logging.h"
 #include "base/metrics/histogram.h"
 
 AutofillMetrics::AutofillMetrics() {
diff --git a/chrome/browser/autofill/autofill_metrics.h b/chrome/browser/autofill/autofill_metrics.h
index bb5b00d..c63bf89 100644
--- a/chrome/browser/autofill/autofill_metrics.h
+++ b/chrome/browser/autofill/autofill_metrics.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_METRICS_H_
 #pragma once
 
+#include <stddef.h>
 #include <string>
 
 #include "base/basictypes.h"
diff --git a/chrome/browser/autofill/autofill_profile.cc b/chrome/browser/autofill/autofill_profile.cc
index cc0ab01..458beee 100644
--- a/chrome/browser/autofill/autofill_profile.cc
+++ b/chrome/browser/autofill/autofill_profile.cc
@@ -4,13 +4,14 @@
 
 #include "chrome/browser/autofill/autofill_profile.h"
 
-#include <algorithm>
+#include <map>
 #include <set>
 
-#include "base/stl_util-inl.h"
+#include "base/basictypes.h"
+#include "base/logging.h"
+#include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/address.h"
-#include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/contact_info.h"
 #include "chrome/browser/autofill/fax_number.h"
diff --git a/chrome/browser/autofill/autofill_profile.h b/chrome/browser/autofill/autofill_profile.h
index 11e8bce..617099c 100644
--- a/chrome/browser/autofill/autofill_profile.h
+++ b/chrome/browser/autofill/autofill_profile.h
@@ -6,14 +6,18 @@
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_PROFILE_H_
 #pragma once
 
+#include <stddef.h>
 #include <list>
-#include <map>
+#include <ostream>
+#include <string>
 #include <vector>
 
 #include "base/string16.h"
 #include "chrome/browser/autofill/address.h"
+#include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/contact_info.h"
 #include "chrome/browser/autofill/fax_number.h"
+#include "chrome/browser/autofill/field_types.h"
 #include "chrome/browser/autofill/form_group.h"
 #include "chrome/browser/autofill/home_phone_number.h"
 
diff --git a/chrome/browser/autofill/autofill_type.cc b/chrome/browser/autofill/autofill_type.cc
index b9c1618..4ee6350 100644
--- a/chrome/browser/autofill/autofill_type.cc
+++ b/chrome/browser/autofill/autofill_type.cc
@@ -4,7 +4,8 @@
 
 #include "chrome/browser/autofill/autofill_type.h"
 
-#include "base/basictypes.h"
+#include <ostream>
+
 #include "base/logging.h"
 
 namespace {
diff --git a/chrome/browser/autofill/autofill_xml_parser.cc b/chrome/browser/autofill/autofill_xml_parser.cc
index 4dd2f1c..c6f229e7 100644
--- a/chrome/browser/autofill/autofill_xml_parser.cc
+++ b/chrome/browser/autofill/autofill_xml_parser.cc
@@ -4,7 +4,10 @@
 
 #include "chrome/browser/autofill/autofill_xml_parser.h"
 
-#include "chrome/browser/autofill/autofill_type.h"
+#include <stdlib.h>
+#include <string.h>
+
+#include "base/logging.h"
 #include "third_party/libjingle/overrides/talk/xmllite/qname.h"
 
 AutofillXmlParser::AutofillXmlParser()
diff --git a/chrome/browser/autofill/contact_info.cc b/chrome/browser/autofill/contact_info.cc
index 009cca6..ad103a6 100644
--- a/chrome/browser/autofill/contact_info.cc
+++ b/chrome/browser/autofill/contact_info.cc
@@ -4,7 +4,12 @@
 
 #include "chrome/browser/autofill/contact_info.h"
 
+#include <stddef.h>
+#include <ostream>
+#include <string>
+
 #include "base/basictypes.h"
+#include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_type.h"
diff --git a/chrome/browser/autofill/contact_info.h b/chrome/browser/autofill/contact_info.h
index 52755aa..1ccca4e 100644
--- a/chrome/browser/autofill/contact_info.h
+++ b/chrome/browser/autofill/contact_info.h
@@ -10,6 +10,7 @@
 
 #include "base/gtest_prod_util.h"
 #include "base/string16.h"
+#include "chrome/browser/autofill/field_types.h"
 #include "chrome/browser/autofill/form_group.h"
 
 // A form group that stores name information.
diff --git a/chrome/browser/autofill/credit_card.cc b/chrome/browser/autofill/credit_card.cc
index ed91ae3..94b4eb0 100644
--- a/chrome/browser/autofill/credit_card.cc
+++ b/chrome/browser/autofill/credit_card.cc
@@ -4,9 +4,11 @@
 
 #include "chrome/browser/autofill/credit_card.h"
 
+#include <stddef.h>
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/logging.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
@@ -18,6 +20,7 @@
 #include "grit/generated_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRegularExpression.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextCaseSensitivity.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
diff --git a/chrome/browser/autofill/credit_card.h b/chrome/browser/autofill/credit_card.h
index dffe004..1df635d 100644
--- a/chrome/browser/autofill/credit_card.h
+++ b/chrome/browser/autofill/credit_card.h
@@ -6,9 +6,12 @@
 #define CHROME_BROWSER_AUTOFILL_CREDIT_CARD_H_
 #pragma once
 
+#include <ostream>
+#include <string>
 #include <vector>
 
 #include "base/string16.h"
+#include "chrome/browser/autofill/field_types.h"
 #include "chrome/browser/autofill/form_group.h"
 
 // A form group that stores credit card information.
diff --git a/chrome/browser/autofill/credit_card_field.cc b/chrome/browser/autofill/credit_card_field.cc
index 4be4c90..9e31e32 100644
--- a/chrome/browser/autofill/credit_card_field.cc
+++ b/chrome/browser/autofill/credit_card_field.cc
@@ -4,10 +4,15 @@
 
 #include "chrome/browser/autofill/credit_card_field.h"
 
+#include <stddef.h>
+
+#include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
+#include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_field.h"
+#include "chrome/browser/autofill/field_types.h"
 #include "grit/autofill_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
diff --git a/chrome/browser/autofill/credit_card_field.h b/chrome/browser/autofill/credit_card_field.h
index 4a44686..bef9aae 100644
--- a/chrome/browser/autofill/credit_card_field.h
+++ b/chrome/browser/autofill/credit_card_field.h
@@ -8,6 +8,8 @@
 
 #include <vector>
 
+#include "base/basictypes.h"
+#include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/form_field.h"
 
 class AutofillField;
diff --git a/chrome/browser/autofill/credit_card_field_unittest.cc b/chrome/browser/autofill/credit_card_field_unittest.cc
index 5411f7d..d9b6fa9 100644
--- a/chrome/browser/autofill/credit_card_field_unittest.cc
+++ b/chrome/browser/autofill/credit_card_field_unittest.cc
@@ -5,6 +5,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/credit_card_field.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/form_field.h"
diff --git a/chrome/browser/autofill/fax_number.h b/chrome/browser/autofill/fax_number.h
index 8c2eda7..292a169a5 100644
--- a/chrome/browser/autofill/fax_number.h
+++ b/chrome/browser/autofill/fax_number.h
@@ -6,10 +6,9 @@
 #define CHROME_BROWSER_AUTOFILL_FAX_NUMBER_H_
 #pragma once
 
+#include "chrome/browser/autofill/field_types.h"
 #include "chrome/browser/autofill/phone_number.h"
 
-class FormGroup;
-
 class FaxNumber : public PhoneNumber {
  public:
   FaxNumber();
diff --git a/chrome/browser/autofill/form_field.cc b/chrome/browser/autofill/form_field.cc
index 1126fad..19d0dab 100644
--- a/chrome/browser/autofill/form_field.cc
+++ b/chrome/browser/autofill/form_field.cc
@@ -4,16 +4,25 @@
 
 #include "chrome/browser/autofill/form_field.h"
 
+#include <stddef.h>
+#include <string>
+#include <utility>
+
+#include "base/logging.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/address_field.h"
 #include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/credit_card_field.h"
+#include "chrome/browser/autofill/field_types.h"
+#include "chrome/browser/autofill/form_structure.h"
 #include "chrome/browser/autofill/name_field.h"
 #include "chrome/browser/autofill/phone_field.h"
 #include "grit/autofill_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRegularExpression.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextCaseSensitivity.h"
 #include "ui/base/l10n/l10n_util.h"
 
 // Field names from the ECML specification; see RFC 3106.  We've
diff --git a/chrome/browser/autofill/form_field.h b/chrome/browser/autofill/form_field.h
index 7d663f6..70dea64 100644
--- a/chrome/browser/autofill/form_field.h
+++ b/chrome/browser/autofill/form_field.h
@@ -8,10 +8,12 @@
 
 #include <vector>
 
+#include "base/basictypes.h"
 #include "base/string16.h"
-#include "base/string_util.h"
 #include "chrome/browser/autofill/autofill_type.h"
-#include "chrome/browser/autofill/form_structure.h"
+
+class AutofillField;
+class FormStructure;
 
 extern const char kEcmlShipToTitle[];
 extern const char kEcmlShipToFirstName[];
@@ -61,8 +63,6 @@ enum FormFieldType {
   kOtherFieldType
 };
 
-class AutofillField;
-
 // Represents a logical form field in a web form.  Classes that implement this
 // interface can identify themselves as a particular type of form field, e.g.
 // name, phone number, or address field.
diff --git a/chrome/browser/autofill/form_field_unittest.cc b/chrome/browser/autofill/form_field_unittest.cc
index 9a0e291..e9df2de 100644
--- a/chrome/browser/autofill/form_field_unittest.cc
+++ b/chrome/browser/autofill/form_field_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/form_field.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/autofill/phone_field_unittest.cc b/chrome/browser/autofill/phone_field_unittest.cc
index bbc52ad..daa598b 100644
--- a/chrome/browser/autofill/phone_field_unittest.cc
+++ b/chrome/browser/autofill/phone_field_unittest.cc
@@ -5,6 +5,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/phone_field.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/form_field.h"