Upgrade Seperator in New Autofill UI

chrome/browser/autofill/autofill_popup_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 "chrome/browser/autofill/autofill_popup_view.h"
 #include "chrome/browser/autofill/test_autofill_external_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
@@ skipping 19 matching lines @@
 class TestAutofillPopupView : public AutofillPopupView {
  public:
   explicit TestAutofillPopupView(AutofillExternalDelegate* external_delegate) :
       AutofillPopupView(NULL, external_delegate) {}
   virtual ~TestAutofillPopupView() {}
 
   // Making protected functions public for testing
   const std::vector<string16>& autofill_values() const {
     return AutofillPopupView::autofill_values();
   }
+  int row_count() {
+    return AutofillPopupView::row_count();
+  }
   int selected_line() const {
     return AutofillPopupView::selected_line();
   }
   void SetSelectedLine(size_t selected_line) {
     AutofillPopupView::SetSelectedLine(selected_line);
   }
   void SelectNextLine() {
     AutofillPopupView::SelectNextLine();
   }
   void SelectPreviousLine() {
     AutofillPopupView::SelectPreviousLine();
   }
   bool RemoveSelectedLine() {
     return AutofillPopupView::RemoveSelectedLine();
   }
-  bool IsSeparatorIndex(int index) {
-    return AutofillPopupView::IsSeparatorIndex(index);
+  int RowToIndex(size_t row) {
+    return AutofillPopupView::RowToIndex(row);
   }
 
   MOCK_METHOD1(InvalidateRow, void(size_t));
   MOCK_METHOD0(HideInternal, void());
 
  private:
   virtual void ShowInternal() OVERRIDE {}
 
   virtual void ResizePopup() OVERRIDE {}
 };
@@ skipping 20 matching lines @@
   autofill_popup_view_->Show(autofill_values, autofill_values, autofill_values,
                              autofill_ids);
 
   // To remove warnings.
   EXPECT_CALL(*autofill_popup_view_, InvalidateRow(_)).Times(AtLeast(0));
 
   EXPECT_LT(autofill_popup_view_->selected_line(), 0);
   // Check that there are at least 2 values so that the first and last selection
   // are different.
   EXPECT_GE(2,
-            static_cast<int>(autofill_popup_view_->autofill_values().size()));
+            static_cast<int>(autofill_popup_view_->row_count()));
 
   // Test wrapping before the front.
   autofill_popup_view_->SelectPreviousLine();
   EXPECT_EQ(
-      static_cast<int>(autofill_popup_view_->autofill_values().size() - 1),
+      static_cast<int>(autofill_popup_view_->row_count() - 1),
       autofill_popup_view_->selected_line());
 
   // Test wrapping after the end.
   autofill_popup_view_->SelectNextLine();
   EXPECT_EQ(0, autofill_popup_view_->selected_line());
 }
 
 TEST_F(AutofillPopupViewUnitTest, RedrawSelectedLine) {
   // Set up the popup.
   std::vector<string16> autofill_values(2, string16());
@@ skipping 37 matching lines @@
   EXPECT_FALSE(autofill_popup_view_->RemoveSelectedLine());
   EXPECT_LE(0, autofill_popup_view_->selected_line());
 
   // Remove the first (and only) entry. The popup should then be hidden since
   // there are no Autofill entries left.
   EXPECT_CALL(*autofill_popup_view_, HideInternal());
   autofill_popup_view_->SetSelectedLine(0);
   EXPECT_TRUE(autofill_popup_view_->RemoveSelectedLine());
 }
 
-TEST_F(AutofillPopupViewUnitTest, IsSeparatorIndex) {
- // Set up the popup.
-  std::vector<string16> autofill_values(3, string16());
+TEST_F(AutofillPopupViewUnitTest, IndexToRowMappings) {
+  // Set up the popup.
+  std::vector<string16> autofill_values(6, string16());
   std::vector<int> autofill_ids;
+  autofill_ids.push_back(0);
+  autofill_ids.push_back(WebAutofillClient::MenuItemIDSeparator);
   autofill_ids.push_back(3);
+  autofill_ids.push_back(WebAutofillClient::MenuItemIDSeparator);
   autofill_ids.push_back(WebAutofillClient::MenuItemIDClearForm);
   autofill_ids.push_back(WebAutofillClient::MenuItemIDAutofillOptions);
 
   autofill_popup_view_->Show(autofill_values, autofill_values, autofill_values,
                              autofill_ids);
 
-  EXPECT_FALSE(autofill_popup_view_->IsSeparatorIndex(0));
-  EXPECT_TRUE(autofill_popup_view_->IsSeparatorIndex(1));
-  EXPECT_FALSE(autofill_popup_view_->IsSeparatorIndex(2));
+  EXPECT_EQ(4, autofill_popup_view_->row_count());
+
+  EXPECT_EQ(0, autofill_popup_view_->RowToIndex(0));
+  EXPECT_EQ(2, autofill_popup_view_->RowToIndex(1));
+  EXPECT_EQ(4, autofill_popup_view_->RowToIndex(2));
+  EXPECT_EQ(5, autofill_popup_view_->RowToIndex(3));
+  EXPECT_EQ(-1, autofill_popup_view_->RowToIndex(4));
 }