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 a6d31237dab561cd7ec0cdf38accd934293da4a2..c6e911ee727c7368d9dd96ac59886ec34e2b348e 100644
--- a/chrome/test/base/browser_with_test_window_test.h
+++ b/chrome/test/base/browser_with_test_window_test.h
@@ -28,6 +28,8 @@
 
 class GURL;
 
+#if defined(TOOLKIT_VIEWS)
+
 #if defined(OS_CHROMEOS)
 namespace ash {
 namespace test {
@@ -35,12 +37,17 @@ class AshTestEnvironment;
 class AshTestHelper;
 }
 }
-#elif defined(TOOLKIT_VIEWS)
+#else
 namespace views {
 class ScopedViewsTestHelper;
 }
 #endif
 
+namespace views {
+class TestViewsDelegate;
+}
+#endif
+
 namespace content {
 class NavigationController;
 }
@@ -148,6 +155,10 @@ class BrowserWithTestWindowTest : public testing::Test {
                                  bool hosted_app,
                                  BrowserWindow* browser_window);
 
+#if defined(TOOLKIT_VIEWS)
+  views::TestViewsDelegate* test_views_delegate();
+#endif
+
  private:
   // We need to create a MessageLoop, otherwise a bunch of things fails.
   content::TestBrowserThreadBundle thread_bundle_;