Broke out layout metric information from ViewsDelegate to LayoutProvider

chrome/test/base/browser_with_test_window_test.cc

Index: chrome/test/base/browser_with_test_window_test.cc
diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
index 08a9dd7ab2e11003e9966c62b718e8181912b179..5b1396c277476f0e610f08c9fd039a64886d3f6d 100644
--- a/chrome/test/base/browser_with_test_window_test.cc
+++ b/chrome/test/base/browser_with_test_window_test.cc
@@ -15,6 +15,7 @@
 #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/browser/ui/views/harmony/chrome_layout_delegate.h"

[Peter Kasting, 2017/04/06 08:13:36]

Can this test really be compiled without TOOLKIT_VIEWS?  Because the existing
file implied it could be, but these changes definitely won't work.

(1) You'll need to restructure the platform-specific-includes below like:

#if defined(TOOLKIT_VIEWS)
#include "chrome/browser/ui/views/harmony/chrome_layout_delegate.h"

#if defined(OS_CHROMEOS)
... the #includes you have in it now
#else
... the #includes in it now
#include "ui/views/test/test_views_delegate.h"
#endif
#endif

(2) You'll need to move the set_layout_delegate() call below into the
TOOLKIT_VIEWS block just above it.

(3) You'll need to write test_views_delegate() like: 

#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

[kylix_rd, 2017/04/06 16:48:19]

Done.

 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
@@ -23,9 +24,11 @@
 #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(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)
 #include "ui/views/test/scoped_views_test_helper.h"
@@ -68,6 +71,9 @@ void BrowserWithTestWindowTest::SetUp() {
   SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient());
 #endif
 
+  test_views_delegate()->set_layout_delegate(
+      base::MakeUnique<ChromeLayoutDelegate>());
+
   if (content::IsBrowserSideNavigationEnabled())
     content::BrowserSideNavigationSetUp();
 
@@ -208,3 +214,11 @@ Browser* BrowserWithTestWindowTest::CreateBrowser(
   params.window = browser_window;
   return new Browser(params);
 }
+
+views::TestViewsDelegate* BrowserWithTestWindowTest::test_views_delegate() {
+#if defined(OS_CHROMEOS)
+  return ash_test_helper_->test_views_delegate();
+#elif defined(TOOLKIT_VIEWS)
+  return views_test_helper_->test_views_delegate();
+#endif
+}