Moving the autofill enum from blink side to browser side

chrome/browser/ui/autofill/autofill_popup_controller_unittest.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 "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
 #include "chrome/browser/ui/autofill/popup_constants.h"
 #include "chrome/browser/ui/autofill/test_popup_controller_common.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/content/browser/autofill_driver_impl.h"
 #include "components/autofill/core/browser/autofill_external_delegate.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
+#include "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/browser/test_autofill_external_delegate.h"
 #include "components/autofill/core/browser/test_autofill_manager_delegate.h"
 #include "grit/webkit_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/web/WebAutofillClient.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/text_utils.h"
 
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::NiceMock;
 using base::ASCIIToUTF16;
 using base::WeakPtr;
-using blink::WebAutofillClient;
 
 namespace autofill {
 namespace {
 
 class MockAutofillExternalDelegate : public AutofillExternalDelegate {
  public:
   MockAutofillExternalDelegate(AutofillManager* autofill_manager,
                                AutofillDriver* autofill_driver)
       : AutofillExternalDelegate(autofill_manager, autofill_driver) {}
   virtual ~MockAutofillExternalDelegate() {}
@@ skipping 184 matching lines @@
   EXPECT_CALL(*autofill_popup_controller_, InvalidateRow(selected_line));
   autofill_popup_controller_->SetSelectedLine(-1);
 }
 
 TEST_F(AutofillPopupControllerUnitTest, RemoveLine) {
   // Set up the popup.
   std::vector<base::string16> names(3, base::string16());
   std::vector<int> autofill_ids;
   autofill_ids.push_back(1);
   autofill_ids.push_back(1);
-  autofill_ids.push_back(WebAutofillClient::MenuItemIDAutofillOptions);
+  autofill_ids.push_back(POPUP_ITEM_ID_AUTOFILL_OPTIONS);
   autofill_popup_controller_->Show(names, names, names, autofill_ids);
 
   // Generate a popup, so it can be hidden later. It doesn't matter what the
   // external_delegate thinks is being shown in the process, since we are just
   // testing the popup here.
   autofill::GenerateTestAutofillPopup(external_delegate_.get());
 
   // No line is selected so the removal should fail.
   EXPECT_FALSE(autofill_popup_controller_->RemoveSelectedLine());
 
@@ skipping 34 matching lines @@
   EXPECT_CALL(*autofill_popup_controller_, Hide());
   EXPECT_CALL(*autofill_popup_controller_, InvalidateRow(_)).Times(0);
   EXPECT_TRUE(autofill_popup_controller_->RemoveSelectedLine());
 }
 
 TEST_F(AutofillPopupControllerUnitTest, SkipSeparator) {
   // Set up the popup.
   std::vector<base::string16> names(3, base::string16());
   std::vector<int> autofill_ids;
   autofill_ids.push_back(1);
-  autofill_ids.push_back(WebAutofillClient::MenuItemIDSeparator);
-  autofill_ids.push_back(WebAutofillClient::MenuItemIDAutofillOptions);
+  autofill_ids.push_back(POPUP_ITEM_ID_SEPARATOR);
+  autofill_ids.push_back(POPUP_ITEM_ID_AUTOFILL_OPTIONS);
   autofill_popup_controller_->Show(names, names, names, autofill_ids);
 
   autofill_popup_controller_->SetSelectedLine(0);
 
   // Make sure next skips the unselectable separator.
   autofill_popup_controller_->SelectNextLine();
   EXPECT_EQ(2, autofill_popup_controller_->selected_line());
 
   // Make sure previous skips the unselectable separator.
   autofill_popup_controller_->SelectPreviousLine();
@@ skipping 50 matching lines @@
   // Add one data list entry.
   std::vector<base::string16> data_list_values;
   data_list_values.push_back(ASCIIToUTF16("data list value 1"));
 
   autofill_popup_controller_->UpdateDataListValues(data_list_values,
                                                    data_list_values);
 
   // Update the expected values.
   items.insert(items.begin(), data_list_values[0]);
   items.insert(items.begin() + 1, base::string16());
-  ids.insert(ids.begin(), WebAutofillClient::MenuItemIDDataListEntry);
-  ids.insert(ids.begin() + 1, WebAutofillClient::MenuItemIDSeparator);
+  ids.insert(ids.begin(), POPUP_ITEM_ID_DATALIST_ENTRY);
+  ids.insert(ids.begin() + 1, POPUP_ITEM_ID_SEPARATOR);
 
   EXPECT_EQ(items, autofill_popup_controller_->names());
   EXPECT_EQ(ids, autofill_popup_controller_->identifiers());
 
   // Add two data list entries (which should replace the current one).
   data_list_values.push_back(ASCIIToUTF16("data list value 2"));
 
   autofill_popup_controller_->UpdateDataListValues(data_list_values,
                                                    data_list_values);
 
   // Update the expected values.
   items.insert(items.begin() + 1, data_list_values[1]);
-  ids.insert(ids.begin(), WebAutofillClient::MenuItemIDDataListEntry);
+  ids.insert(ids.begin(), POPUP_ITEM_ID_DATALIST_ENTRY);
 
   EXPECT_EQ(items, autofill_popup_controller_->names());
   EXPECT_EQ(ids, autofill_popup_controller_->identifiers());
 
   // Clear all data list values.
   data_list_values.clear();
 
   autofill_popup_controller_->UpdateDataListValues(data_list_values,
                                                    data_list_values);
 
   items.clear();
   items.push_back(base::string16());
   ids.clear();
   ids.push_back(1);
 
   EXPECT_EQ(items, autofill_popup_controller_->names());
   EXPECT_EQ(ids, autofill_popup_controller_->identifiers());
 }
 
 TEST_F(AutofillPopupControllerUnitTest, PopupsWithOnlyDataLists) {
   // Create the popup with a single datalist element.
   std::vector<base::string16> items;
   items.push_back(base::string16());
   std::vector<int> ids;
-  ids.push_back(WebAutofillClient::MenuItemIDDataListEntry);
+  ids.push_back(POPUP_ITEM_ID_DATALIST_ENTRY);
 
   autofill_popup_controller_->Show(items, items, items, ids);
 
   EXPECT_EQ(items, autofill_popup_controller_->names());
   EXPECT_EQ(ids, autofill_popup_controller_->identifiers());
 
   // Replace the datalist element with a new one.
   std::vector<base::string16> data_list_values;
   data_list_values.push_back(ASCIIToUTF16("data list value 1"));
 
@@ skipping 113 matching lines @@
   EXPECT_NE(names[0], autofill_popup_controller_->names()[0]);
   EXPECT_NE(subtexts[0], autofill_popup_controller_->subtexts()[0]);
 
   // The second element was shorter so it should be unchanged.
   EXPECT_EQ(names[1], autofill_popup_controller_->names()[1]);
   EXPECT_EQ(subtexts[1], autofill_popup_controller_->subtexts()[1]);
 }
 #endif
 
 }  // namespace autofill