Broke out layout metric information from ViewsDelegate to LayoutProvider

chrome/test/base/browser_with_test_window_test.h

Index: chrome/test/base/browser_with_test_window_test.h
diff --git a/chrome/test/base/browser_with_test_window_test.h b/chrome/test/base/browser_with_test_window_test.h
index 18c5e06316bc7e5e199b419864dadd620bba0584..7a0ff6efbc0ecfffe819e344c44b60421377007c 100644
--- a/chrome/test/base/browser_with_test_window_test.h
+++ b/chrome/test/base/browser_with_test_window_test.h
@@ -16,10 +16,16 @@
 #include "content/public/test/test_renderer_host.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(TOOLKIT_VIEWS)
 #if defined(OS_CHROMEOS)
+#include "ash/test/ash_test_helper.h"
+#include "ash/test/ash_test_views_delegate.h"
 #include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
+#else
+#include "ui/views/test/scoped_views_test_helper.h"
+#endif
 #endif
 
 #if defined(OS_WIN)
@@ -28,16 +34,18 @@
 
 class GURL;
 
+#if defined(TOOLKIT_VIEWS)
+

[Peter Kasting, 2017/04/12 21:37:44]

Nit: Either remove this blank line or add one above the closing #endif (I'd do
the former)

[kylix_rd, 2017/04/13 16:45:42]

Done.

 #if defined(OS_CHROMEOS)
 namespace ash {
 namespace test {
 class AshTestEnvironment;
-class AshTestHelper;
 }
 }
-#elif defined(TOOLKIT_VIEWS)
+#endif
+
 namespace views {

[Peter Kasting, 2017/04/12 21:37:44]

Nit: I suggest placing this stuff above the nested #ifdef OS_CHROMEOS above

[kylix_rd, 2017/04/13 16:45:42]

Done.

-class ScopedViewsTestHelper;
+class TestViewsDelegate;
 }
 #endif
 
@@ -144,6 +152,16 @@ class BrowserWithTestWindowTest : public testing::Test {
                                  bool hosted_app,
                                  BrowserWindow* browser_window);
 
+#if defined(TOOLKIT_VIEWS)
+  views::TestViewsDelegate* test_views_delegate() {
+#if defined(OS_CHROMEOS)
+    return ash_test_helper_->test_views_delegate();
+#else
+    return views_test_helper_->test_views_delegate();
+#endif
+  }
+#endif
+
  private:
   // We need to create a MessageLoop, otherwise a bunch of things fails.
   content::TestBrowserThreadBundle thread_bundle_;