Download autocheckout whitelist and enable autocheckout for whitelisted sites only.

chrome/browser/autofill/form_structure.cc

 // 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.
 
 #include "chrome/browser/autofill/form_structure.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 209 matching lines @@
   return UNKNOWN_TYPE;
 }
 
 }  // namespace
 
 FormStructure::FormStructure(const FormData& form)
     : form_name_(form.name),
       source_url_(form.origin),
       target_url_(form.action),
       autofill_count_(0),
+      upload_required_(USE_UPLOAD_RATES),
+      server_experiment_id_("no server response"),
+      current_page_number_(-1),
+      total_pages_(-1),
+      has_author_specified_types_(false),
+      autocheckout_enabled_(false) {
+  Init(form);
+}
+
+FormStructure::FormStructure(const FormData& form, bool autocheckout_enabled)
+    : form_name_(form.name),
+      source_url_(form.origin),
+      target_url_(form.action),
+      autofill_count_(0),
       checkable_field_count_(0),
       upload_required_(USE_UPLOAD_RATES),
       server_experiment_id_("no server response"),
       current_page_number_(-1),
       total_pages_(-1),
       has_author_specified_types_(false),
-      experimental_form_filling_enabled_(
-          CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kEnableExperimentalFormFilling)) {
+      autocheckout_enabled_(autocheckout_enabled) {
+  Init(form);
+}
+
+void FormStructure::Init(const FormData& form) {
   // Copy the form fields.
   std::map<string16, size_t> unique_names;
   for (std::vector<FormFieldData>::const_iterator field =
            form.fields.begin();
        field != form.fields.end(); field++) {
     // Skipping checkable elements when flag is not set, else these fields will
     // interfere with existing field signatures with Autofill servers.
-    // TODO(ramankk): Add checkable elements only on whitelisted pages
-    if (!field->is_checkable || experimental_form_filling_enabled_) {
+    if (!field->is_checkable || autocheckout_enabled_) {
       // Add all supported form fields (including with empty names) to the
       // signature.  This is a requirement for Autofill servers.
       form_signature_field_names_.append("&");
       form_signature_field_names_.append(UTF16ToUTF8(field->name));
     }
 
     // Generate a unique name for this field by appending a counter to the name.
     // Make sure to prepend the counter with a non-numeric digit so that we are
     // guaranteed to avoid collisions.
     if (!unique_names.count(field->name))
@@ skipping 153 matching lines @@
   *encoded_xml += autofill_request_xml.Str().c_str();
 
   return true;
 }
 
 // static
 void FormStructure::ParseQueryResponse(const std::string& response_xml,
                                        const std::vector<FormStructure*>& forms,
                                        const AutofillMetrics& metric_logger) {
   metric_logger.LogServerQueryMetric(AutofillMetrics::QUERY_RESPONSE_RECEIVED);
-

[Ilya Sherman, 2013/01/24 22:01:55]

nit: Please revert this diff.

[benquan, 2013/01/25 00:55:31]

Done.

   // Parse the field types from the server response to the query.
   std::vector<AutofillServerFieldInfo> field_infos;
   UploadRequired upload_required;
   std::string experiment_id;
   AutofillQueryXmlParser parse_handler(&field_infos, &upload_required,
                                        &experiment_id);
   buzz::XmlParser parser(&parse_handler);
   parser.Parse(response_xml.c_str(), response_xml.length(), true);
   if (!parse_handler.succeeded())
     return;
@@ skipping 104 matching lines @@
   }
 
   std::string form_string = scheme + "://" + host + "&" +
                             UTF16ToUTF8(form_name_) +
                             form_signature_field_names_;
 
   return Hash64Bit(form_string);
 }
 
 bool FormStructure::IsAutofillable(bool require_method_post) const {
-  // TODO(ramankk): Remove this check once we have better way of identifying the
-  // cases to trigger experimental form filling.
-  if (experimental_form_filling_enabled_)
+  if (autocheckout_enabled_)
     return true;
 
   if (autofill_count() < kRequiredFillableFields)
     return false;
 
   return ShouldBeParsed(require_method_post);
 }
 
 void FormStructure::UpdateAutofillCount() {
   autofill_count_ = 0;
   for (std::vector<AutofillField*>::const_iterator iter = begin();
        iter != end(); ++iter) {
     AutofillField* field = *iter;
     if (field && field->IsFieldFillable())
       ++autofill_count_;
   }
 }
 
 bool FormStructure::ShouldBeParsed(bool require_method_post) const {
-  // TODO(ramankk): Remove this check once we have better way of identifying the
-  // cases to trigger experimental form filling.
-  if (experimental_form_filling_enabled_)
+  if (autocheckout_enabled_)
     return true;
 
   // Ignore counting checkable elements towards minimum number of elements
   // required to parse. This avoids trying to crowdsource forms with few text
   // or select elements.
   if ((field_count() - checkable_field_count()) < kRequiredFillableFields)
     return false;
 
   // Rule out http(s)://*/search?...
   //  e.g. http://www.google.com/search?q=...
@@ skipping 340 matching lines @@
         buzz::XmlElement *field_element = new buzz::XmlElement(
             buzz::QName(kXMLElementField));
 
         field_element->SetAttr(buzz::QName(kAttributeSignature),
                                field->FieldSignature());
         field_element->SetAttr(buzz::QName(kAttributeAutofillType),
                                base::IntToString(*field_type));
         encompassing_xml_element->AddElement(field_element);
       }
     } else {
-      // Skip putting checkable fields in the request if the flag is not set.
-      if (field->is_checkable && !experimental_form_filling_enabled_)
+      // Skip putting checkable fields in the request if autocheckout is not
+      // enabled.
+      if (field->is_checkable && !autocheckout_enabled_)
         continue;
 
       buzz::XmlElement *field_element = new buzz::XmlElement(
           buzz::QName(kXMLElementField));
       field_element->SetAttr(buzz::QName(kAttributeSignature),
                              field->FieldSignature());
       encompassing_xml_element->AddElement(field_element);
     }
   }
   return true;
@@ skipping 170 matching lines @@
   for (std::vector<AutofillField*>::iterator field = fields_.begin();
        field != fields_.end(); ++field) {
     AutofillType::FieldTypeGroup field_type_group =
         AutofillType((*field)->type()).group();
     if (field_type_group == AutofillType::CREDIT_CARD)
       (*field)->set_section((*field)->section() + "-cc");
     else
       (*field)->set_section((*field)->section() + "-default");
   }
 }