mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/autofill/simple_grid_layout_unittest.mm

 // Copyright (c) 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 "chrome/browser/ui/cocoa/autofill/simple_grid_layout.h"
 
 #include "base/logging.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Layout objects as multiple columns in a single row.
 class ColumnLayout : public SimpleGridLayout {
  public:
    ColumnLayout(NSView* host)  : SimpleGridLayout(host) { AddRow(); }
    ~ColumnLayout() {}
 };
 
 class LayoutTest : public testing::Test {
  public:
-  scoped_nsobject<NSView> CreateViewWithWidth(float width) {
+  base::scoped_nsobject<NSView> CreateViewWithWidth(float width) {

[Mark Mentovai, 2013/06/24 21:29:48]

These two methods should not return scoped_nsobjects.

     NSRect frame = NSMakeRect(0, 0, width, 0);
-    scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:frame]);
+    base::scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:frame]);
     return view;
   }
 
-  scoped_nsobject<NSView> CreateViewWithHeight(float height) {
+  base::scoped_nsobject<NSView> CreateViewWithHeight(float height) {
     NSRect frame = NSMakeRect(0, 0, 0, height);
-    scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:frame]);
+    base::scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:frame]);
     return view;
   }
 };
 
 TEST_F(LayoutTest, GridLayoutAddGetColumnSet) {
   SimpleGridLayout layout(NULL);
 
   // Non-existing id's are not found.
   EXPECT_EQ(0L, layout.GetColumnSet(1));
 
@@ skipping 59 matching lines @@
   EXPECT_TRUE(new_column_set != NULL);
   EXPECT_EQ(new_column_set, layout.GetLastValidColumnSet());
 }
 
 TEST_F(LayoutTest, AddPaddingRow) {
   SimpleGridLayout layout(NULL);
 
   ColumnSet* cs;
   cs = layout.AddRow();
   cs->AddColumn(1.0f);
-  scoped_nsobject<NSView> view1 = CreateViewWithHeight(30.0f);
+  base::scoped_nsobject<NSView> view1 = CreateViewWithHeight(30.0f);
   layout.AddView(view1);
 
   layout.AddPaddingRow(20);
 
   cs = layout.AddRow();
   cs->AddColumn(1.0f);
   EXPECT_EQ(3, layout.num_rows());
-  scoped_nsobject<NSView> view2 = CreateViewWithHeight(10.0f);
+  base::scoped_nsobject<NSView> view2 = CreateViewWithHeight(10.0f);
   layout.AddView(view2);
 
   layout.SizeRowsAndColumns(0.0f);
   EXPECT_FLOAT_EQ(30.0f, layout.GetRowHeight(0));
   EXPECT_FLOAT_EQ(20.0f, layout.GetRowHeight(1));
   EXPECT_FLOAT_EQ(10.0f, layout.GetRowHeight(2));
 }
 
 TEST_F(LayoutTest, RowsAccomodateHeightOfAllElements) {
   SimpleGridLayout layout(NULL);
 
   layout.AddRow();
   layout.GetLastValidColumnSet()->AddColumn(0.6f);
   layout.GetLastValidColumnSet()->AddColumn(0.6f);
   layout.GetLastValidColumnSet()->AddColumn(0.6f);
 
-  scoped_nsobject<NSView> view1 = CreateViewWithHeight(37.0f);
+  base::scoped_nsobject<NSView> view1 = CreateViewWithHeight(37.0f);
   layout.AddView(view1);
   layout.SizeRowsAndColumns(0.0f);
   EXPECT_FLOAT_EQ(37.0f, layout.GetRowHeight(0));
 
-  scoped_nsobject<NSView> view2 = CreateViewWithHeight(26.0f);
+  base::scoped_nsobject<NSView> view2 = CreateViewWithHeight(26.0f);
   layout.AddView(view2);
   layout.SizeRowsAndColumns(0.0f);
   EXPECT_FLOAT_EQ(37.0f, layout.GetRowHeight(0));
 
-  scoped_nsobject<NSView> view3 = CreateViewWithHeight(42.0f);
+  base::scoped_nsobject<NSView> view3 = CreateViewWithHeight(42.0f);
   layout.AddView(view3);
   layout.SizeRowsAndColumns(0.0f);
   EXPECT_FLOAT_EQ(42.0f, layout.GetRowHeight(0));
 }
 
 TEST_F(LayoutTest, SizeRowsAdjustsRowLocations) {
   SimpleGridLayout layout(NULL);
 
   layout.AddRow();
   layout.GetLastValidColumnSet()->AddColumn(0.6f);
-  scoped_nsobject<NSView> view1 = CreateViewWithHeight(30.0f);
+  base::scoped_nsobject<NSView> view1 = CreateViewWithHeight(30.0f);
   layout.AddView(view1);
 
   layout.AddRow();
   layout.GetLastValidColumnSet()->AddColumn(0.6f);
-  scoped_nsobject<NSView> view2 = CreateViewWithHeight(40.0f);
+  base::scoped_nsobject<NSView> view2 = CreateViewWithHeight(40.0f);
   layout.AddView(view2);
 
   layout.SizeRowsAndColumns(0.0f);
   EXPECT_FLOAT_EQ(0.0f, layout.GetRowLocation(0));
   EXPECT_FLOAT_EQ(30.0f, layout.GetRowLocation(1));
 }
 
 TEST_F(LayoutTest, SimpleGridLayoutAdjustsViews) {
   SimpleGridLayout layout(NULL);
 
   layout.AddRow();
   layout.GetLastValidColumnSet()->AddColumn(0.6f);
   layout.GetLastValidColumnSet()->AddPaddingColumn(30);
   layout.GetLastValidColumnSet()->AddColumn(0.4f);
 
-  scoped_nsobject<NSView> view1 = CreateViewWithHeight(22.0f);
-  scoped_nsobject<NSView> view2 = CreateViewWithHeight(20.0f);
+  base::scoped_nsobject<NSView> view1 = CreateViewWithHeight(22.0f);
+  base::scoped_nsobject<NSView> view2 = CreateViewWithHeight(20.0f);
   layout.AddView(view1);
   layout.AddView(view2);
 
   layout.AddRow();
   layout.GetLastValidColumnSet()->AddColumn(0.6f);
-  scoped_nsobject<NSView> view3 = CreateViewWithHeight(18.0f);
+  base::scoped_nsobject<NSView> view3 = CreateViewWithHeight(18.0f);
   layout.AddView(view3);
 
-  scoped_nsobject<NSView> host_view = CreateViewWithWidth(150.0f);
+  base::scoped_nsobject<NSView> host_view = CreateViewWithWidth(150.0f);
   layout.Layout(host_view);
 
   EXPECT_FLOAT_EQ(72.0f, NSWidth([view1 frame]));
   EXPECT_FLOAT_EQ(22.0f, NSHeight([view1 frame]));
   EXPECT_FLOAT_EQ(0.0f, NSMinX([view1 frame]));
   EXPECT_FLOAT_EQ(0.0f, NSMinY([view1 frame]));
 
   EXPECT_FLOAT_EQ(48.0f, NSWidth([view2 frame]));
   EXPECT_FLOAT_EQ(22.0f, NSHeight([view2 frame]));
   EXPECT_FLOAT_EQ(102.0f, NSMinX([view2 frame]));
   EXPECT_FLOAT_EQ(0.0f, NSMinY([view2 frame]));
 
   EXPECT_FLOAT_EQ(150.0f, NSWidth([view3 frame]));
   EXPECT_FLOAT_EQ(18.0f, NSHeight([view3 frame]));
   EXPECT_FLOAT_EQ(0.0f, NSMinX([view3 frame]));
   EXPECT_FLOAT_EQ(22.0f, NSMinY([view3 frame]));
 }
 
 TEST_F(LayoutTest, PreferredHeightForEmptyLayout) {
   SimpleGridLayout layout(NULL);
   EXPECT_FLOAT_EQ(0.0f, layout.GetPreferredHeightForWidth(100.0));
 }
 
 TEST_F(LayoutTest, SimpleGridLayoutHeightForWidth)
 {
   SimpleGridLayout layout(NULL);
   layout.AddRow();
   layout.GetLastValidColumnSet()->AddColumn(0.6f);
 
-  scoped_nsobject<NSView> view1 = CreateViewWithHeight(22.0f);
+  base::scoped_nsobject<NSView> view1 = CreateViewWithHeight(22.0f);
   layout.AddView(view1);
   EXPECT_FLOAT_EQ(22.0f, layout.GetPreferredHeightForWidth(100.0));
 
   layout.AddPaddingRow(12);
   EXPECT_FLOAT_EQ(34.0f, layout.GetPreferredHeightForWidth(100.0));
 
   layout.AddRow();
   layout.GetLastValidColumnSet()->AddColumn(0.6f);
-  scoped_nsobject<NSView> view2 = CreateViewWithHeight(13.0f);
+  base::scoped_nsobject<NSView> view2 = CreateViewWithHeight(13.0f);
   layout.AddView(view2);
   EXPECT_FLOAT_EQ(47.0f, layout.GetPreferredHeightForWidth(100.0));
 }
 
 TEST_F(LayoutTest, SkipColumns) {
   ColumnLayout layout(NULL);
 
   ASSERT_TRUE(layout.GetLastValidColumnSet() != NULL);
   layout.GetLastValidColumnSet()->AddColumn(0.6f);
   layout.GetLastValidColumnSet()->AddColumn(0.6f);
@@ skipping 64 matching lines @@
 
 TEST_F(LayoutTest, AddViewSkipsPaddingColumns) {
   ColumnLayout layout(NULL);
 
   ASSERT_TRUE(layout.GetLastValidColumnSet() != NULL);
   layout.GetLastValidColumnSet()->AddColumn(0.6f);
   layout.GetLastValidColumnSet()->AddPaddingColumn(30);
   layout.GetLastValidColumnSet()->AddColumn(0.4f);
 
   EXPECT_EQ(0, layout.next_column());
-  scoped_nsobject<NSView> view1 = CreateViewWithWidth(37.0f);
+  base::scoped_nsobject<NSView> view1 = CreateViewWithWidth(37.0f);
   layout.AddView(view1);
   EXPECT_EQ(2, layout.next_column());
 }
 
 TEST_F(LayoutTest, ColumnLayoutAdjustsViews) {
   ColumnLayout layout(NULL);
 
   ASSERT_TRUE(layout.GetLastValidColumnSet() != NULL);
   layout.GetLastValidColumnSet()->AddColumn(0.6f);
   layout.GetLastValidColumnSet()->AddPaddingColumn(30);
   layout.GetLastValidColumnSet()->AddColumn(0.4f);
 
-  scoped_nsobject<NSView> view1 = CreateViewWithWidth(37.0f);
-  scoped_nsobject<NSView> view2 = CreateViewWithWidth(42.0f);
+  base::scoped_nsobject<NSView> view1 = CreateViewWithWidth(37.0f);
+  base::scoped_nsobject<NSView> view2 = CreateViewWithWidth(42.0f);
   layout.AddView(view1);
   layout.AddView(view2);
 
-  scoped_nsobject<NSView> host_view = CreateViewWithWidth(150.0f);
+  base::scoped_nsobject<NSView> host_view = CreateViewWithWidth(150.0f);
   layout.Layout(host_view);
 
   EXPECT_FLOAT_EQ(72.0f, NSWidth([view1 frame]));
   EXPECT_FLOAT_EQ(48.0f, NSWidth([view2 frame]));
 }
 
 TEST_F(LayoutTest, ColumnSetAddPadding) {
   ColumnSet columns(0);
 
   columns.AddPaddingColumn(20);
@@ skipping 48 matching lines @@
   EXPECT_FLOAT_EQ(20.0f, columns.GetColumnWidth(1));
   EXPECT_FLOAT_EQ(32.0f, columns.GetColumnWidth(2));
 
   columns.CalculateSize(200.0f);
   EXPECT_FLOAT_EQ(108.0f, columns.GetColumnWidth(0));
   EXPECT_FLOAT_EQ(20.0f, columns.GetColumnWidth(1));
   EXPECT_FLOAT_EQ(72.0f, columns.GetColumnWidth(2));
 }
 
 }  // namespace