Broke out layout metric information from ViewsDelegate to LayoutProvider

chrome/test/base/browser_with_test_window_test.h

 // 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.
 
 #ifndef CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
 
 #include "base/at_exit.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/test_browser_window.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #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)
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
 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)
-namespace views {
-class ScopedViewsTestHelper;
-}
 #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 TestViewsDelegate;
+}
+#endif
+
 namespace content {
 class NavigationController;
 }
 
 // Base class for browser based unit tests. BrowserWithTestWindowTest creates a
 // Browser with a TestingProfile and TestBrowserWindow. To add a tab use
 // AddTab. For example, the following adds a tab and navigates to
 // two URLs that target the TestWebContents:
 //
 //   // Add a new tab and navigate it. This will be at index 0.
@@ skipping 83 matching lines @@
   // value. Can return NULL to use the default window created by Browser.
   virtual BrowserWindow* CreateBrowserWindow();
 
   // Creates the browser given |profile|, |browser_type|, |hosted_app|, and
   // |browser_window|. The caller owns the return value.
   virtual Browser* CreateBrowser(Profile* profile,
                                  Browser::Type browser_type,
                                  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_;
   base::ShadowingAtExitManager at_exit_manager_;
 
 #if defined(OS_CHROMEOS)
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
   chromeos::ScopedTestUserManager test_user_manager_;
 #endif
@@ skipping 23 matching lines @@
   // The type of browser to create (tabbed or popup).
   Browser::Type browser_type_;
 
   // Whether the browser is part of a hosted app.
   bool hosted_app_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest);
 };
 
 #endif  // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_