AutoFill fill billing address when credit card settings specify a billing address.

chrome/browser/autofill/address_field.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/autofill/address_field.h"
 
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "chrome/browser/autofill/autofill_field.h"
@@ skipping 369 matching lines @@
       text.find(ASCIIToUTF16("use my")) != string16::npos)
     // This text could be a checkbox label such as "same as my billing
     // address" or "use my shipping address".
     // ++ It would help if we generally skipped all text that appears
     // after a check box.
     return kGenericAddress;
 
   // Not all pages say "billing address" and "shipping address" explicitly;
   // for example, Craft Catalog1.html has "Bill-to Address" and
   // "Ship-to Address".
-  size_t bill = text.find_last_of(ASCIIToUTF16("bill"));
-  size_t ship = text.find_last_of(ASCIIToUTF16("ship"));
+  size_t bill = text.rfind(ASCIIToUTF16("bill"));
+  size_t ship = text.rfind(ASCIIToUTF16("ship"));
 
-  if (bill != string16::npos && bill > ship)
+  if (bill == string16::npos && ship == string16::npos)
+    return kGenericAddress;
+
+  if (bill != string16::npos && ship == string16::npos)
     return kBillingAddress;
 
-  if (ship != string16::npos)
+  if (bill == string16::npos && ship != string16::npos)
     return kShippingAddress;
 
-  return kGenericAddress;
+  if (bill > ship)
+    return kBillingAddress;
+
+  return kShippingAddress;
 }