Revert 181798 for excessive leaks.

ui/views/focus/focus_traversal_unittest.cc

 // Copyright (c) 2012 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 "ui/views/focus/focus_manager.h"
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/radio_button.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/label.h"
 #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 {
 
 int count = 1;
 
 const int kTopCheckBoxID = count++;  // 1
 const int kLeftContainerID = count++;
 const int kAppleLabelID = count++;
 const int kAppleTextfieldID = count++;
@@ skipping 24 matching lines @@
 const int kJoyeuxNoelLinkID = count++;
 const int kCampingLinkID = count++;
 const int kBriceDeNiceLinkID = count++;
 const int kTaxiLinkID = count++;  // 30
 const int kAsterixLinkID = count++;
 
 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++;
 const int kSearchButtonID = count++;
 const int kHelpLinkID = count++;
 
 const int kThumbnailContainerID = count++;  // 45
 const int kThumbnailStarID = count++;
 const int kThumbnailSuperStarID = count++;
 
@@ skipping 103 matching lines @@
 
   virtual void InitContentView() OVERRIDE;
 
  protected:
   FocusTraversalTest();
 
   View* FindViewByID(int id) {
     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);
     if (view)
       return view;
     return NULL;
   }
 
  protected:
+#if !defined(USE_AURA)
   TabbedPane* style_tab_;
+#endif
   BorderView* search_border_view_;
   DummyComboboxModel combobox_model_;
   PaneView* left_container_;
   PaneView* right_container_;
 
   DISALLOW_COPY_AND_ASSIGN(FocusTraversalTest);
 };
 
 FocusTraversalTest::FocusTraversalTest()
-    : style_tab_(NULL),
+    :
+#if !defined(USE_AURA)
+      style_tab_(NULL),
+#endif
       search_border_view_(NULL) {
 }
 
 FocusTraversalTest::~FocusTraversalTest() {
 }
 
 void FocusTraversalTest::InitContentView() {
   // Create a complicated view hierarchy with lots of control types for
   // use by all of the focus traversal tests.
   //
@@ skipping 28 matching lines @@
   //           Link        * kVisitingLinkID
   //           Link        * kAmelieLinkID
   //           Link        * kJoyeuxNoelLinkID
   //           Link        * kCampingLinkID
   //           Link        * kBriceDeNiceLinkID
   //           Link        * kTaxiLinkID
   //           Link        * kAsterixLinkID
   //   NativeButton        * kOKButtonID
   //   NativeButton        * kCancelButtonID
   //   NativeButton        * kHelpButtonID
+  // #if !defined(USE_AURA)
   //   TabbedPane          * kStyleContainerID
   //     View
   //       Checkbox        * kBoldCheckBoxID
   //       Checkbox        * kItalicCheckBoxID
   //       Checkbox        * kUnderlinedCheckBoxID
   //       Link            * kStyleHelpLinkID
   //       Textfield       * kStyleTextEditID
   //     Other
+  // #endif
   //   BorderView            kSearchContainerID
   //     View
   //       Textfield       * kSearchTextfieldID
   //       NativeButton    * kSearchButtonID
   //       Link            * kHelpLinkID
   //   View                * kThumbnailContainerID
   //     NativeButton      * kThumbnailStarID
   //     NativeButton      * kThumbnailSuperStarID
 
   GetContentsView()->set_background(
@@ skipping 183 matching lines @@
   button = new NativeTextButton(NULL, ASCIIToUTF16("Help"));
   button->set_id(kHelpButtonID);
   GetContentsView()->AddChildView(button);
   button->SetBounds(290, y, width, 30);
 
   y += 40;
 
   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));
   cb = new Checkbox(ASCIIToUTF16("Bold"));
   contents->AddChildView(cb);
   cb->SetBounds(10, 10, 50, 20);
   cb->set_id(kBoldCheckBoxID);
 
   cb = new Checkbox(ASCIIToUTF16("Italic"));
   contents->AddChildView(cb);
@@ skipping 14 matching lines @@
   contents->AddChildView(text_field);
   text_field->SetBounds(10, 50, 100, 20);
   text_field->set_id(kStyleTextEditID);
 
   style_tab_ = new TabbedPane();
   style_tab_->set_id(kStyleContainerID);
   GetContentsView()->AddChildView(style_tab_);
   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();
   contents->set_background(Background::CreateSolidBackground(SK_ColorWHITE));
   text_field = new Textfield();
   contents->AddChildView(text_field);
   text_field->SetBounds(10, 10, 100, 20);
   text_field->set_id(kSearchTextfieldID);
 
   button = new NativeTextButton(NULL, ASCIIToUTF16("Search"));
@@ skipping 36 matching lines @@
 }
 
 TEST_F(FocusTraversalTest, NormalTraversal) {
   const int kTraversalIDs[] = { kTopCheckBoxID,  kAppleTextfieldID,
       kOrangeTextfieldID, kBananaTextfieldID, kKiwiTextfieldID,
       kFruitButtonID, kFruitCheckBoxID, kComboboxID, kBroccoliButtonID,
       kRosettaLinkID, kStupeurEtTremblementLinkID,
       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 };
 
   // Uncomment the following line if you want to test manually the UI of this
   // test.
   // MessageLoopForUI::current()->RunWithDispatcher(new AcceleratorHandler());
 
   // Let's traverse the whole focus hierarchy (several times, to make sure it
   // loops OK).
   GetFocusManager()->ClearFocus();
@@ skipping 17 matching lines @@
       if (focused_view)
         EXPECT_EQ(kTraversalIDs[j], focused_view->id());
     }
   }
 }
 
 TEST_F(FocusTraversalTest, TraversalWithNonEnabledViews) {
   const int kDisabledIDs[] = {
       kBananaTextfieldID, kFruitCheckBoxID, kComboboxID, kAsparagusButtonID,
       kCauliflowerButtonID, kClosetLinkID, kVisitingLinkID, kBriceDeNiceLinkID,
-      kTaxiLinkID, kAsterixLinkID, kHelpButtonID, kBoldCheckBoxID,
+      kTaxiLinkID, kAsterixLinkID, kHelpButtonID,
+#if !defined(USE_AURA)
+      kBoldCheckBoxID,
+#endif
       kSearchTextfieldID, kHelpLinkID };
 
   const int kTraversalIDs[] = { kTopCheckBoxID,  kAppleTextfieldID,
       kOrangeTextfieldID, kKiwiTextfieldID, kFruitButtonID, kBroccoliButtonID,
       kRosettaLinkID, kStupeurEtTremblementLinkID, kDinerGameLinkID,
       kRidiculeLinkID, kAmelieLinkID, kJoyeuxNoelLinkID, kCampingLinkID,
-      kOKButtonID, kCancelButtonID, kStyleContainerID, kItalicCheckBoxID,
-      kUnderlinedCheckBoxID, kStyleHelpLinkID, kStyleTextEditID,
+      kOKButtonID, kCancelButtonID,
+#if !defined(USE_AURA)
+      kStyleContainerID, kItalicCheckBoxID, kUnderlinedCheckBoxID,
+      kStyleHelpLinkID, kStyleTextEditID,
+#endif
       kSearchButtonID, kThumbnailContainerID, kThumbnailStarID,
       kThumbnailSuperStarID };
 
   // Let's disable some views.
   for (size_t i = 0; i < arraysize(kDisabledIDs); i++) {
     View* v = FindViewByID(kDisabledIDs[i]);
     ASSERT_TRUE(v != NULL);
     v->SetEnabled(false);
   }
 
@@ skipping 30 matching lines @@
 TEST_F(FocusTraversalTest, TraversalWithInvisibleViews) {
   const int kInvisibleIDs[] = { kTopCheckBoxID, kOKButtonID,
       kThumbnailContainerID };
 
   const int kTraversalIDs[] = { kAppleTextfieldID, kOrangeTextfieldID,
       kBananaTextfieldID, kKiwiTextfieldID, kFruitButtonID, kFruitCheckBoxID,
       kComboboxID, kBroccoliButtonID, kRosettaLinkID,
       kStupeurEtTremblementLinkID, kDinerGameLinkID, kRidiculeLinkID,
       kClosetLinkID, kVisitingLinkID, kAmelieLinkID, kJoyeuxNoelLinkID,
       kCampingLinkID, kBriceDeNiceLinkID, kTaxiLinkID, kAsterixLinkID,
-      kCancelButtonID, kHelpButtonID, kStyleContainerID, kBoldCheckBoxID,
-      kItalicCheckBoxID, kUnderlinedCheckBoxID, kStyleHelpLinkID,
-      kStyleTextEditID, kSearchTextfieldID, kSearchButtonID, kHelpLinkID };
+      kCancelButtonID, kHelpButtonID,
+#if !defined(USE_AURA)
+      kStyleContainerID, kBoldCheckBoxID, kItalicCheckBoxID,
+      kUnderlinedCheckBoxID, kStyleHelpLinkID, kStyleTextEditID,
+#endif
+      kSearchTextfieldID, kSearchButtonID, kHelpLinkID };
 
 
   // Let's make some views invisible.
   for (size_t i = 0; i < arraysize(kInvisibleIDs); i++) {
     View* v = FindViewByID(kInvisibleIDs[i]);
     ASSERT_TRUE(v != NULL);
     v->SetVisible(false);
   }
 
   // Uncomment the following line if you want to test manually the UI of this
@@ skipping 97 matching lines @@
       GetFocusManager()->AdvanceFocus(true);
       View* focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
       if (focused_view)
         EXPECT_EQ(kRightTraversalIDs[j], focused_view->id());
     }
   }
 }
 
 }  // namespace views