[AiS] changing mac omnibox suggestions form NSMatrix to NSTableView

chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix_unittest.mm

Index: chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix_unittest.mm
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix_unittest.mm
index 191d5906b190ae76446e3fcff0d53488f5c16d6b..d029647efdac99be14285b025bd35926735ddb06 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix_unittest.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix_unittest.mm
@@ -2,15 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h"
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.h"
 
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "ui/events/test/cocoa_test_event_utils.h"
 
+@interface OmniboxPopupTableController ()
+// Setup the information used by the NSTableView data source.
+- (instancetype)initWithArray:(NSArray*)array;
+@end

[Scott Hess - ex-Googler, 2015/06/12 22:21:59]

I'm losing the ability to follow the discussion, but personally I would be
comfortable with this being in a TestingAPI category exposed in the header file,
rather than having multiple copy/paste declarations.  The .mm implementation
will enforce what it sees at compile-time, but this one could be arbitrarily
different and still link and run.

[groby-ooo-7-16, 2015/06/12 22:43:01]

What Scott said. Anonymous categories should only be applied if it's _actually_
private to the .mm file the category is in.

[dschuyler, 2015/06/12 23:07:54]

My intention is that it is private.  If my intention is incorrect, then I should
move this.  Is it wrong for me to intend this to be private?

[Scott Hess - ex-Googler, 2015/06/12 23:18:13]

Objective-C is very dynamic and many of the checks we do have are based on
compile-time annotations.  The compiler can verify that your signatures match in
the implementation file, but since this file can't see inside that file, it'll
just assume that you know what you're doing.  So you can get something like a
C++ one-definition-rule violation, and nobody helps you find it, and maybe it
works at runtime and maybe it doesn't.

Chromium convention is to put a TestingAPI category in a header, and then make
rude comments if someone later comes along and uses it in production code. 
Generally Chromium Objective-C classes simply aren't general-purpose enough that
anyone ever wants to use your private methods :-).

[dschuyler, 2015/06/13 00:11:04]

Done.

+
 namespace {
 
-NSEvent* MouseEventInRow(NSMatrix* matrix, NSEventType type, NSInteger row) {
-  NSRect cell_rect = [matrix cellFrameAtRow:row column:0];
+NSEvent* MouseEventInRow(OmniboxPopupMatrix* matrix,
+                         NSEventType type,
+                         NSInteger row) {
+  NSRect cell_rect = [matrix rectOfRow:row];
   NSPoint point_in_view = NSMakePoint(NSMidX(cell_rect), NSMidY(cell_rect));
   NSPoint point_in_window = [matrix convertPoint:point_in_view toView:nil];
   return cocoa_test_event_utils::MouseEventAtPoint(
@@ -21,20 +29,24 @@ class OmniboxPopupMatrixTest : public CocoaTest,
                                public OmniboxPopupMatrixObserver {
  public:
   OmniboxPopupMatrixTest()
-      : selected_row_(0),
-        clicked_row_(0),
-        middle_clicked_row_(0) {
-  }
+      : selected_row_(0), clicked_row_(0), middle_clicked_row_(0) {}
 
   void SetUp() override {
     CocoaTest::SetUp();
     matrix_.reset([[OmniboxPopupMatrix alloc] initWithObserver:this]);
     [[test_window() contentView] addSubview:matrix_];
+
+    NSMutableArray* array = [NSMutableArray array];
+    for (size_t i = 0; i < 3; ++i)
+      [array addObject:[[[OmniboxPopupCellData alloc] init] autorelease]];
+
+    matrixController_.reset(
+        [[OmniboxPopupTableController alloc] initWithArray:array]);
+    [matrix_ setController:matrixController_];
   };
 
   void OnMatrixRowSelected(OmniboxPopupMatrix* matrix, size_t row) override {
     selected_row_ = row;
-    [matrix_ selectCellAtRow:row column:0];
   }
 
   void OnMatrixRowClicked(OmniboxPopupMatrix* matrix, size_t row) override {
@@ -48,6 +60,7 @@ class OmniboxPopupMatrixTest : public CocoaTest,
 
  protected:
   base::scoped_nsobject<OmniboxPopupMatrix> matrix_;
+  base::scoped_nsobject<OmniboxPopupTableController> matrixController_;
   size_t selected_row_;
   size_t clicked_row_;
   size_t middle_clicked_row_;
@@ -59,7 +72,6 @@ class OmniboxPopupMatrixTest : public CocoaTest,
 TEST_VIEW(OmniboxPopupMatrixTest, matrix_);
 
 TEST_F(OmniboxPopupMatrixTest, HighlightedRow) {
-  [matrix_ renewRows:3 columns:1];
   EXPECT_EQ(-1, [matrix_ highlightedRow]);
 
   [matrix_ mouseEntered:MouseEventInRow(matrix_, NSMouseMoved, 0)];
@@ -72,8 +84,6 @@ TEST_F(OmniboxPopupMatrixTest, HighlightedRow) {
 }
 
 TEST_F(OmniboxPopupMatrixTest, SelectedRow) {
-  [matrix_ renewRows:3 columns:1];
-
   [NSApp postEvent:MouseEventInRow(matrix_, NSLeftMouseUp, 2) atStart:YES];
   [matrix_ mouseDown:MouseEventInRow(matrix_, NSLeftMouseDown, 2)];