1 files changed, 5 insertions, 24 deletions
diff --git a/chromium/components/autofill/core/common/field_data_manager_unittest.cc b/chromium/components/autofill/core/common/field_data_manager_unittest.cc
index 8c56453876e..ca525b3a14a 100644
--- a/chromium/components/autofill/core/common/field_data_manager_unittest.cc
+++ b/chromium/components/autofill/core/common/field_data_manager_unittest.cc
@@ -44,14 +44,14 @@ TEST_F(FieldDataManagerTest, UpdateFieldDataMap) {
       FieldPropertiesFlags::kUserTyped);
   const FieldRendererId id(control_elements_[0].unique_renderer_id);
   EXPECT_TRUE(field_data_manager->HasFieldData(id));
-  EXPECT_EQ(UTF8ToUTF16("first"), field_data_manager->GetUserTypedValue(id));
+  EXPECT_EQ(UTF8ToUTF16("first"), field_data_manager->GetUserInput(id));
   EXPECT_EQ(FieldPropertiesFlags::kUserTyped,
             field_data_manager->GetFieldPropertiesMask(id));
 
   field_data_manager->UpdateFieldDataMap(
       control_elements_[0].unique_renderer_id, UTF8ToUTF16("newvalue"),
       FieldPropertiesFlags::kAutofilled);
-  EXPECT_EQ(UTF8ToUTF16("newvalue"), field_data_manager->GetUserTypedValue(id));
+  EXPECT_EQ(UTF8ToUTF16("newvalue"), field_data_manager->GetUserInput(id));
   FieldPropertiesMask mask =
       FieldPropertiesFlags::kUserTyped | FieldPropertiesFlags::kAutofilled;
   EXPECT_EQ(mask, field_data_manager->GetFieldPropertiesMask(id));
@@ -75,14 +75,14 @@ TEST_F(FieldDataManagerTest, UpdateFieldDataMapWithNullValue) {
       FieldPropertiesFlags::kUserTyped);
   const FieldRendererId id(control_elements_[0].unique_renderer_id);
   EXPECT_TRUE(field_data_manager->HasFieldData(id));
-  EXPECT_EQ(base::string16(), field_data_manager->GetUserTypedValue(id));
+  EXPECT_EQ(base::string16(), field_data_manager->GetUserInput(id));
   EXPECT_EQ(FieldPropertiesFlags::kUserTyped,
             field_data_manager->GetFieldPropertiesMask(id));
 
   field_data_manager->UpdateFieldDataMapWithNullValue(
       control_elements_[0].unique_renderer_id,
       FieldPropertiesFlags::kAutofilled);
-  EXPECT_EQ(base::string16(), field_data_manager->GetUserTypedValue(id));
+  EXPECT_EQ(base::string16(), field_data_manager->GetUserInput(id));
   FieldPropertiesMask mask =
       FieldPropertiesFlags::kUserTyped | FieldPropertiesFlags::kAutofilled;
   EXPECT_EQ(mask, field_data_manager->GetFieldPropertiesMask(id));
@@ -90,7 +90,7 @@ TEST_F(FieldDataManagerTest, UpdateFieldDataMapWithNullValue) {
   field_data_manager->UpdateFieldDataMap(
       control_elements_[0].unique_renderer_id, control_elements_[0].value,
       FieldPropertiesFlags::kAutofilled);
-  EXPECT_EQ(UTF8ToUTF16("first"), field_data_manager->GetUserTypedValue(id));
+  EXPECT_EQ(UTF8ToUTF16("first"), field_data_manager->GetUserInput(id));
 }
 
 TEST_F(FieldDataManagerTest, FindMachedValue) {
@@ -105,23 +105,4 @@ TEST_F(FieldDataManagerTest, FindMachedValue) {
       field_data_manager->FindMachedValue(UTF8ToUTF16("second_element")));
 }
 
-TEST_F(FieldDataManagerTest, UpdateFieldDataMapWithAutofilledValue) {
-  const scoped_refptr<FieldDataManager> field_data_manager =
-      base::MakeRefCounted<FieldDataManager>();
-  const FieldRendererId id(control_elements_[0].unique_renderer_id);
-  // Add a typed value to make sure it will be cleared.
-  field_data_manager->UpdateFieldDataMap(id, ASCIIToUTF16("typedvalue"), 0);
-
-  field_data_manager->UpdateFieldDataWithAutofilledValue(
-      id, ASCIIToUTF16("autofilled"),
-      FieldPropertiesFlags::kAutofilledOnPageLoad);
-
-  EXPECT_TRUE(field_data_manager->HasFieldData(id));
-  EXPECT_EQ(base::string16(), field_data_manager->GetUserTypedValue(id));
-  EXPECT_EQ(UTF8ToUTF16("autofilled"),
-            field_data_manager->GetAutofilledValue(id));
-  EXPECT_EQ(FieldPropertiesFlags::kAutofilledOnPageLoad,
-            field_data_manager->GetFieldPropertiesMask(id));
-}
-
 }  // namespace autofill