Use a direct include of strings headers in components/, part 1.

components/autofill/browser/autofill_country.h

 // 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 COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_COUNTRY_H_
 #define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_COUNTRY_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace autofill {
 
 // The minimal required fields for an address to be complete for a given
 // country.
 enum AddressRequiredFields {
   ADDRESS_REQUIRES_CITY  = 1 << 0,
   ADDRESS_REQUIRES_STATE = 1 << 1,
   ADDRESS_REQUIRES_ZIP   = 1 << 2,
 
@@ skipping 78 matching lines @@
 
   // Address requirement field codes for the country.
   AddressRequiredFields address_required_fields_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillCountry);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_COUNTRY_H_