Change Widget::GetAllOwnedWidgets to return child widgets as well

ui/views/widget/widget_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 <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 2648 matching lines @@
   EXPECT_EQ(0, v1->GetEventCount(ui::ET_GESTURE_END));
   EXPECT_EQ(0, v2->GetEventCount(ui::ET_GESTURE_END));
   EXPECT_EQ(0, v3->GetEventCount(ui::ET_GESTURE_END));
   EXPECT_EQ(0, v4->GetEventCount(ui::ET_GESTURE_END));
   EXPECT_EQ(NULL, GetGestureHandler(root_view));
   EXPECT_TRUE(end.handled());
 
   widget->Close();
 }
 
-// Test the result of Widget::GetAllChildWidgets().
-TEST_F(WidgetTest, GetAllChildWidgets) {
+// Test the result of Widget::GetAllChildAndOwnedWidgets().
+TEST_F(WidgetTest, GetAllChildAndOwnedWidgets) {
   // Create the following widget hierarchy:
   //
   // toplevel
   // +-- w1
   //     +-- w11
   // +-- w2
   //     +-- w21
   //     +-- w22
   Widget* toplevel = CreateTopLevelPlatformWidget();
   Widget* w1 = CreateChildPlatformWidget(toplevel->GetNativeView());
   Widget* w11 = CreateChildPlatformWidget(w1->GetNativeView());
   Widget* w2 = CreateChildPlatformWidget(toplevel->GetNativeView());
   Widget* w21 = CreateChildPlatformWidget(w2->GetNativeView());
   Widget* w22 = CreateChildPlatformWidget(w2->GetNativeView());
 
   std::set<Widget*> expected;
   expected.insert(toplevel);
   expected.insert(w1);
   expected.insert(w11);
   expected.insert(w2);
   expected.insert(w21);
   expected.insert(w22);
 
   std::set<Widget*> widgets;
-  Widget::GetAllChildWidgets(toplevel->GetNativeView(), &widgets);
+  Widget::GetAllChildAndOwnedWidgets(toplevel->GetNativeView(), &widgets);
 
   EXPECT_EQ(expected.size(), widgets.size());
   EXPECT_TRUE(std::equal(expected.begin(), expected.end(), widgets.begin()));
 }
 
 // Used by DestroyChildWidgetsInOrder. On destruction adds the supplied name to
 // a vector.
 class DestroyedTrackingView : public View {
  public:
   DestroyedTrackingView(const std::string& name,
@@ skipping 664 matching lines @@
 
   EXPECT_EQ(test_rect, root_view->bounds());
   widget->ReorderNativeViews();
   EXPECT_EQ(test_rect, root_view->bounds());
 
   widget->CloseNow();
 }
 
 }  // namespace test
 }  // namespace views