[Autofill] Distinguish between native field types and potentially HTML field types.

components/autofill/core/browser/autofill_download_unittest.cc

 // Copyright 2013 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 <list>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_timeouts.h"
@@ skipping 186 matching lines @@
   MockAutofillMetrics mock_metric_logger;
   EXPECT_CALL(mock_metric_logger,
               LogServerQueryMetric(AutofillMetrics::QUERY_SENT)).Times(1);
   EXPECT_TRUE(download_manager_.StartQueryRequest(form_structures.get(),
                                                   mock_metric_logger));
   // Set upload to 100% so requests happen.
   download_manager_.SetPositiveUploadRate(1.0);
   download_manager_.SetNegativeUploadRate(1.0);
   // Request with id 1.
   EXPECT_TRUE(download_manager_.StartUploadRequest(
-      *(form_structures[0]), true, FieldTypeSet()));
+      *(form_structures[0]), true, ServerFieldTypeSet()));
   // Request with id 2.
   EXPECT_TRUE(download_manager_.StartUploadRequest(
-      *(form_structures[1]), false, FieldTypeSet()));
+      *(form_structures[1]), false, ServerFieldTypeSet()));
 
   const char *responses[] = {
     "<autofillqueryresponse>"
       "<field autofilltype=\"0\" />"
       "<field autofilltype=\"3\" />"
       "<field autofilltype=\"5\" />"
       "<field autofilltype=\"9\" />"
       "<field autofilltype=\"0\" />"
       "<field autofilltype=\"30\" />"
       "<field autofilltype=\"31\" />"
@@ skipping 44 matching lines @@
   EXPECT_EQ(0, responses_.front().error);
   EXPECT_EQ(std::string(), responses_.front().signature);
   EXPECT_EQ(responses[0], responses_.front().response);
   responses_.pop_front();
 
   // Set upload to 0% so no new requests happen.
   download_manager_.SetPositiveUploadRate(0.0);
   download_manager_.SetNegativeUploadRate(0.0);
   // No actual requests for the next two calls, as we set upload rate to 0%.
   EXPECT_FALSE(download_manager_.StartUploadRequest(
-      *(form_structures[0]), true, FieldTypeSet()));
+      *(form_structures[0]), true, ServerFieldTypeSet()));
   EXPECT_FALSE(download_manager_.StartUploadRequest(
-      *(form_structures[1]), false, FieldTypeSet()));
+      *(form_structures[1]), false, ServerFieldTypeSet()));
   fetcher = factory.GetFetcherByID(3);
   EXPECT_EQ(NULL, fetcher);
 
   // Modify form structures to miss the cache.
   field.label = ASCIIToUTF16("Address line 2");
   field.name = ASCIIToUTF16("address2");
   field.form_control_type = "text";
   form.fields.push_back(field);
   form_structure = new FormStructure(form, std::string());
   form_structures.push_back(form_structure);
@@ skipping 20 matching lines @@
               LogServerQueryMetric(AutofillMetrics::QUERY_SENT)).Times(0);
   EXPECT_FALSE(download_manager_.StartQueryRequest(form_structures.get(),
                                                    mock_metric_logger));
   fetcher = factory.GetFetcherByID(4);
   EXPECT_EQ(NULL, fetcher);
 
   // Set upload required to true so requests happen.
   form_structures[0]->upload_required_ = UPLOAD_REQUIRED;
   // Request with id 4.
   EXPECT_TRUE(download_manager_.StartUploadRequest(
-      *(form_structures[0]), true, FieldTypeSet()));
+      *(form_structures[0]), true, ServerFieldTypeSet()));
   fetcher = factory.GetFetcherByID(4);
   ASSERT_TRUE(fetcher);
   fetcher->set_backoff_delay(TestTimeouts::action_max_timeout());
   FakeOnURLFetchComplete(fetcher, 503, std::string(responses[2]));
   EXPECT_EQ(AutofillDownloadTest::REQUEST_UPLOAD_FAILED,
             responses_.front().type_of_response);
   EXPECT_EQ(503, responses_.front().error);
   responses_.pop_front();
 
   // Upload requests should be ignored for the next 10 seconds.
   EXPECT_FALSE(download_manager_.StartUploadRequest(
-      *(form_structures[0]), true, FieldTypeSet()));
+      *(form_structures[0]), true, ServerFieldTypeSet()));
   fetcher = factory.GetFetcherByID(5);
   EXPECT_EQ(NULL, fetcher);
 }
 
 TEST_F(AutofillDownloadTest, CacheQueryTest) {
   // Create and register factory.
   net::TestURLFetcherFactory factory;
 
   FormData form;
   form.method = ASCIIToUTF16("post");
@@ skipping 141 matching lines @@
   EXPECT_EQ(static_cast<size_t>(0), responses_.size());
 
   fetcher = factory.GetFetcherByID(3);
   ASSERT_TRUE(fetcher);
   FakeOnURLFetchComplete(fetcher, 200, std::string(responses[0]));
   ASSERT_EQ(static_cast<size_t>(1), responses_.size());
   EXPECT_EQ(responses[0], responses_.front().response);
 }
 
 }  // namespace autofill