Broke out layout metric information from ViewsDelegate to LayoutProvider

ui/views/widget/root_view_unittest.cc

 // Copyright 2013 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/widget/root_view.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "ui/events/event_utils.h"
 #include "ui/views/context_menu_controller.h"
@@ skipping 559 matching lines @@
 // Ensure only one call to Layout() happens during Widget initialization, and
 // ensure it happens at the ContentView's preferred size.
 TEST_F(RootViewTest, SingleLayoutDuringInit) {
   RootViewTestDialogDelegate* delegate = new RootViewTestDialogDelegate();
   Widget* widget =
       DialogDelegate::CreateDialogWidget(delegate, GetContext(), nullptr);
   EXPECT_EQ(1, delegate->layout_count());
   widget->CloseNow();
 
   // Also test Aura desktop Widget codepaths.
-  views_delegate()->set_use_desktop_native_widgets(true);
+  test_views_delegate()->set_use_desktop_native_widgets(true);
   delegate = new RootViewTestDialogDelegate();
   widget = DialogDelegate::CreateDialogWidget(delegate, GetContext(), nullptr);
   EXPECT_EQ(1, delegate->layout_count());
   widget->CloseNow();
 }
 
 }  // namespace test
 }  // namespace views