Remove NativeTabbedPane[Win|Wrapper]; promote Views impl.

ui/views/focus/focus_traversal_unittest.cc

Index: ui/views/focus/focus_traversal_unittest.cc
diff --git a/ui/views/focus/focus_traversal_unittest.cc b/ui/views/focus/focus_traversal_unittest.cc
index 15fc93aa081c558edc3deb6a287b08b33cba1b07..61ca85205b15055c4bce252743a14ebcaf62f79f 100644
--- a/ui/views/focus/focus_traversal_unittest.cc
+++ b/ui/views/focus/focus_traversal_unittest.cc
@@ -15,15 +15,12 @@
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/controls/scroll_view.h"
+#include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/focus/focus_manager_test.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
-#if !defined(USE_AURA)
-#include "ui/views/controls/tabbed_pane/tabbed_pane.h"
-#endif
-
 namespace views {
 
 namespace {
@@ -68,14 +65,12 @@ const int kOKButtonID = count++;
 const int kCancelButtonID = count++;
 const int kHelpButtonID = count++;
 
-#if !defined(USE_AURA)
 const int kStyleContainerID = count++;  // 35
 const int kBoldCheckBoxID = count++;
 const int kItalicCheckBoxID = count++;
 const int kUnderlinedCheckBoxID = count++;
 const int kStyleHelpLinkID = count++;
 const int kStyleTextEditID = count++;  // 40
-#endif
 
 const int kSearchContainerID = count++;
 const int kSearchTextfieldID = count++;
@@ -199,10 +194,8 @@ class FocusTraversalTest : public FocusManagerTest {
     View* view = GetContentsView()->GetViewByID(id);
     if (view)
       return view;
-#if !defined(USE_AURA)
     if (style_tab_)
       view = style_tab_->GetSelectedTab()->GetViewByID(id);
-#endif
     if (view)
       return view;
     view = search_border_view_->GetContentsRootView()->GetViewByID(id);
@@ -212,9 +205,7 @@ class FocusTraversalTest : public FocusManagerTest {
   }
 
  protected:
-#if !defined(USE_AURA)
   TabbedPane* style_tab_;
-#endif
   BorderView* search_border_view_;
   DummyComboboxModel combobox_model_;
   PaneView* left_container_;
@@ -224,10 +215,7 @@ class FocusTraversalTest : public FocusManagerTest {
 };
 
 FocusTraversalTest::FocusTraversalTest()
-    :
-#if !defined(USE_AURA)
-      style_tab_(NULL),
-#endif
+    : style_tab_(NULL),
       search_border_view_(NULL) {
 }
 
@@ -276,7 +264,6 @@ void FocusTraversalTest::InitContentView() {
   //   NativeButton        * kOKButtonID
   //   NativeButton        * kCancelButtonID
   //   NativeButton        * kHelpButtonID
-  // #if !defined(USE_AURA)
   //   TabbedPane          * kStyleContainerID
   //     View
   //       Checkbox        * kBoldCheckBoxID
@@ -285,7 +272,6 @@ void FocusTraversalTest::InitContentView() {
   //       Link            * kStyleHelpLinkID
   //       Textfield       * kStyleTextEditID
   //     Other
-  // #endif
   //   BorderView            kSearchContainerID
   //     View
   //       Textfield       * kSearchTextfieldID
@@ -489,7 +475,6 @@ void FocusTraversalTest::InitContentView() {
   View* contents = NULL;
   Link* link = NULL;
 
-#if !defined(USE_AURA)
   // Left bottom box with style checkboxes.
   contents = new View();
   contents->set_background(Background::CreateSolidBackground(SK_ColorWHITE));
@@ -524,7 +509,6 @@ void FocusTraversalTest::InitContentView() {
   style_tab_->SetBounds(10, y, 210, 100);
   style_tab_->AddTab(ASCIIToUTF16("Style"), contents);
   style_tab_->AddTab(ASCIIToUTF16("Other"), new View());
-#endif
 
   // Right bottom box with search.
   contents = new View();
@@ -581,10 +565,8 @@ TEST_F(FocusTraversalTest, NormalTraversal) {
       kDinerGameLinkID, kRidiculeLinkID, kClosetLinkID, kVisitingLinkID,
       kAmelieLinkID, kJoyeuxNoelLinkID, kCampingLinkID, kBriceDeNiceLinkID,
       kTaxiLinkID, kAsterixLinkID, kOKButtonID, kCancelButtonID, kHelpButtonID,
-#if !defined(USE_AURA)
       kStyleContainerID, kBoldCheckBoxID, kItalicCheckBoxID,
       kUnderlinedCheckBoxID, kStyleHelpLinkID, kStyleTextEditID,
-#endif
       kSearchTextfieldID, kSearchButtonID, kHelpLinkID,
       kThumbnailContainerID, kThumbnailStarID, kThumbnailSuperStarID };
 
@@ -622,21 +604,15 @@ TEST_F(FocusTraversalTest, TraversalWithNonEnabledViews) {
   const int kDisabledIDs[] = {
       kBananaTextfieldID, kFruitCheckBoxID, kComboboxID, kAsparagusButtonID,
       kCauliflowerButtonID, kClosetLinkID, kVisitingLinkID, kBriceDeNiceLinkID,
-      kTaxiLinkID, kAsterixLinkID, kHelpButtonID,
-#if !defined(USE_AURA)
-      kBoldCheckBoxID,
-#endif
+      kTaxiLinkID, kAsterixLinkID, kHelpButtonID, kBoldCheckBoxID,
       kSearchTextfieldID, kHelpLinkID };
 
   const int kTraversalIDs[] = { kTopCheckBoxID,  kAppleTextfieldID,
       kOrangeTextfieldID, kKiwiTextfieldID, kFruitButtonID, kBroccoliButtonID,
       kRosettaLinkID, kStupeurEtTremblementLinkID, kDinerGameLinkID,
       kRidiculeLinkID, kAmelieLinkID, kJoyeuxNoelLinkID, kCampingLinkID,
-      kOKButtonID, kCancelButtonID,
-#if !defined(USE_AURA)
-      kStyleContainerID, kItalicCheckBoxID, kUnderlinedCheckBoxID,
-      kStyleHelpLinkID, kStyleTextEditID,
-#endif
+      kOKButtonID, kCancelButtonID, kStyleContainerID, kItalicCheckBoxID,
+      kUnderlinedCheckBoxID, kStyleHelpLinkID, kStyleTextEditID,
       kSearchButtonID, kThumbnailContainerID, kThumbnailStarID,
       kThumbnailSuperStarID };
 
@@ -687,12 +663,9 @@ TEST_F(FocusTraversalTest, TraversalWithInvisibleViews) {
       kStupeurEtTremblementLinkID, kDinerGameLinkID, kRidiculeLinkID,
       kClosetLinkID, kVisitingLinkID, kAmelieLinkID, kJoyeuxNoelLinkID,
       kCampingLinkID, kBriceDeNiceLinkID, kTaxiLinkID, kAsterixLinkID,
-      kCancelButtonID, kHelpButtonID,
-#if !defined(USE_AURA)
-      kStyleContainerID, kBoldCheckBoxID, kItalicCheckBoxID,
-      kUnderlinedCheckBoxID, kStyleHelpLinkID, kStyleTextEditID,
-#endif
-      kSearchTextfieldID, kSearchButtonID, kHelpLinkID };
+      kCancelButtonID, kHelpButtonID, kStyleContainerID, kBoldCheckBoxID,
+      kItalicCheckBoxID, kUnderlinedCheckBoxID, kStyleHelpLinkID,
+      kStyleTextEditID, kSearchTextfieldID, kSearchButtonID, kHelpLinkID };
 
 
   // Let's make some views invisible.