Make Widget ownership a little clearer by expressing it in terms of an enum.

views/focus/focus_manager_unittest.cc

 // Copyright (c) 2011 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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 1577 matching lines @@
 
   // Create a native dialog window.
   HWND hwnd = CreateWindowEx(0, class_ex.lpszClassName, NULL,
                              WS_OVERLAPPEDWINDOW, 0, 0, 200, 200,
                              NULL, NULL, NULL, NULL);
   ASSERT_TRUE(hwnd);
 
   // Create a view window parented to native dialog.
   scoped_ptr<Widget> widget1(new Widget);
   Widget::InitParams params(Widget::InitParams::TYPE_CONTROL);
-  params.delete_on_destroy = false;
+  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.parent = hwnd;
   params.bounds = gfx::Rect(0, 0, 100, 100);
   widget1->Init(params);
 
   // Get the focus manager directly from the first window.  Should exist
   // because the first window is the root widget.
   views::FocusManager* focus_manager_member1 = widget1->GetFocusManager();
   EXPECT_TRUE(focus_manager_member1);
 
   // Create another view window parented to the first view window.
@@ skipping 113 matching lines @@
 
   // Focus manager should be the last one to destruct.
   ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str());
 
   // Clear window_ so that we don't try to close it again.
   window_ = NULL;
 }
 
 
 }  // namespace views