Broke out layout metric information from ViewsDelegate to LayoutProvider

chrome/test/base/browser_with_test_window_test.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 "chrome/test/base/browser_with_test_window_test.h"
 
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile_destroyer.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/test/browser_side_navigation_test_utils.h"
 #include "content/public/test/test_renderer_host.h"
 #include "ui/base/page_transition_types.h"
+#include "ui/views/test/test_views_delegate.h"
+
+#if defined(TOOLKIT_VIEWS)
+#include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_delegate.h"
+#include "components/constrained_window/constrained_window_views.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/test/ash_test_helper.h"
+#include "ash/test/ash_test_views_delegate.h"
 #include "chrome/test/base/ash_test_environment_chrome.h"
-#elif defined(TOOLKIT_VIEWS)
+#else
 #include "ui/views/test/scoped_views_test_helper.h"
+#include "ui/views/test/test_views_delegate.h"
 #endif
-
-#if defined(TOOLKIT_VIEWS)
-#include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
-#include "components/constrained_window/constrained_window_views.h"
 #endif
 
 using content::NavigationController;
 using content::RenderFrameHost;
 using content::RenderFrameHostTester;
 using content::WebContents;
 
 BrowserWithTestWindowTest::BrowserWithTestWindowTest()
     : BrowserWithTestWindowTest(Browser::TYPE_TABBED, false) {}
 
@@ skipping 12 matching lines @@
   // perhaps by AshTestHelper owning an AuraTestHelper.
   ash_test_environment_ = base::MakeUnique<AshTestEnvironmentChrome>();
   ash_test_helper_.reset(
       new ash::test::AshTestHelper(ash_test_environment_.get()));
   ash_test_helper_->SetUp(true);
 #elif defined(TOOLKIT_VIEWS)
   views_test_helper_.reset(new views::ScopedViewsTestHelper());
 #endif
 #if defined(TOOLKIT_VIEWS)
   SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient());
+
+  test_views_delegate()->set_layout_delegate(
+      base::MakeUnique<ChromeLayoutDelegate>());
 #endif
 
   if (content::IsBrowserSideNavigationEnabled())
     content::BrowserSideNavigationSetUp();
 
   // Subclasses can provide their own Profile.
   profile_ = CreateProfile();
   // Subclasses can provide their own test BrowserWindow. If they return NULL
   // then Browser will create the a production BrowserWindow and the subclass
   // is responsible for cleaning it up (usually by NativeWidget destruction).
@@ skipping 122 matching lines @@
   Browser::CreateParams params(profile, true);
   if (hosted_app) {
     params = Browser::CreateParams::CreateForApp(
         "Test", true /* trusted_source */, gfx::Rect(), profile, true);
   } else {
     params.type = browser_type;
   }
   params.window = browser_window;
   return new Browser(params);
 }
+
+#if defined(TOOLKIT_VIEWS)
+views::TestViewsDelegate* BrowserWithTestWindowTest::test_views_delegate() {
+#if defined(OS_CHROMEOS)
+  return ash_test_helper_->test_views_delegate();
+#else
+  return views_test_helper_->test_views_delegate();
+#endif
+}
+#endif