Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / views / controls / tabbed_pane / tabbed_pane_unittest.cc

diff --git a/src/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc b/src/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc
index b7281b2..72ea86c 100644 (file)
--- a/src/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc
+++ b/src/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc
@@ -9,6 +9,8 @@
 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #include "ui/views/test/views_test_base.h"
 
+using base::ASCIIToUTF16;
+
 namespace views {
 
 namespace {
@@ -20,9 +22,7 @@ class FixedSizeView : public View {
     : size_(size) {}
 
   // Overridden from View:
-  virtual gfx::Size GetPreferredSize() OVERRIDE {
-    return size_;
-  }
+  gfx::Size GetPreferredSize() const override { return size_; }
 
  private:
   const gfx::Size size_;
@@ -34,7 +34,7 @@ typedef ViewsTestBase TabbedPaneTest;
 
 // Tests TabbedPane::GetPreferredSize() and TabbedPane::Layout().
 TEST_F(TabbedPaneTest, SizeAndLayout) {
-  scoped_ptr<TabbedPane> tabbed_pane(new TabbedPane(false));
+  scoped_ptr<TabbedPane> tabbed_pane(new TabbedPane());
   View* child1 = new FixedSizeView(gfx::Size(20, 10));
   tabbed_pane->AddTab(ASCIIToUTF16("tab1"), child1);
   View* child2 = new FixedSizeView(gfx::Size(5, 5));
@@ -66,7 +66,7 @@ TEST_F(TabbedPaneTest, SizeAndLayout) {
 }
 
 TEST_F(TabbedPaneTest, AddAndSelect) {
-  scoped_ptr<TabbedPane> tabbed_pane(new TabbedPane(false));
+  scoped_ptr<TabbedPane> tabbed_pane(new TabbedPane());
   // Add several tabs; only the first should be a selected automatically.
   for (int i = 0; i < 3; ++i) {
     View* tab = new View();