Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / tabs / tab_controller_unittest.mm

diff --git a/src/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm b/src/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm
index 59776db..fe989bb 100644 (file)
--- a/src/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm
+++ b/src/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm
@@ -12,12 +12,11 @@
 #import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
-#include "grit/theme_resources.h"
-#include "grit/ui_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/resources/grit/ui_resources.h"
 
 // Implements the target interface for the tab, which gets sent messages when
 // the tab is clicked on by the user and when its close box is clicked.
@@ -369,24 +368,24 @@ TEST_F(TabControllerTest, ShouldShowIcon) {
   NSView* newIcon = [controller iconView];
   EXPECT_TRUE([newIcon isHidden]);
 
-  // Tab is at selected minimum width. Since it's selected, the close box
+  // Tab is at active minimum width. Since it's active, the close box
   // should be visible.
-  [controller setSelected:YES];
+  [controller setActive:YES];
   frame = [[controller view] frame];
-  frame.size.width = [TabController minSelectedTabWidth];
+  frame.size.width = [TabController minActiveTabWidth];
   [[controller view] setFrame:frame];
   EXPECT_FALSE([controller shouldShowIcon]);
   EXPECT_TRUE([newIcon isHidden]);
   EXPECT_TRUE([controller shouldShowCloseButton]);
 
   // Test expanding the tab to max width and ensure the icon and close box
-  // get put back, even when de-selected.
+  // get put back, even when de-activated.
   frame.size.width = [TabController maxTabWidth];
   [[controller view] setFrame:frame];
   EXPECT_TRUE([controller shouldShowIcon]);
   EXPECT_FALSE([newIcon isHidden]);
   EXPECT_TRUE([controller shouldShowCloseButton]);
-  [controller setSelected:NO];
+  [controller setActive:NO];
   EXPECT_TRUE([controller shouldShowIcon]);
   EXPECT_TRUE([controller shouldShowCloseButton]);
 
@@ -525,7 +524,7 @@ TEST_F(TabControllerTest, DISABLED_LayoutAndVisibilityOfSubviews) {
           tabFrame.size.width = minWidth = [TabController miniTabWidth];
         } else {
           tabFrame.size.width = [TabController maxTabWidth];
-          minWidth = isActiveTab ? [TabController minSelectedTabWidth] :
+          minWidth = isActiveTab ? [TabController minActiveTabWidth] :
               [TabController minTabWidth];
         }
         while (NSWidth(tabFrame) >= minWidth) {