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"
@@ skipping 22 matching lines @@
 namespace test {
 class AshTestEnvironment;
 class AshTestHelper;
 }
 }
 #elif defined(TOOLKIT_VIEWS)
 namespace views {
 class ScopedViewsTestHelper;
 }
 #endif
+namespace views {
+class TestViewsDelegate;
+}
 
 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:
 //
@@ skipping 88 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);
 
+  views::TestViewsDelegate* views_delegate();

[Peter Kasting, 2017/04/04 02:08:55]

Nit: This should be defined here or else named CamelCase.

Consider naming this test_views_delegate() instead, as the code which calls it
does so to call methods available in TestViewsDelegate that aren't in
ViewsDelegate (or it could just use ViewsDelegate::Get()), and it was confusing
me trying to read such code as I reviewed this CL (I was thinking, "how are you
calling ViewsDelegate::set_layout_delegate(), that doesn't exist").

[kylix_rd, 2017/04/04 20:28:23]

Renamed to test_views_delegate().
Good point.

[Peter Kasting, 2017/04/05 19:30:10]

That addresses the second concern I had, but not this one: we use
unix_hacker_names() to indicate inlined cheap accessors, so if this is named
that way it should also be inlined.  If for some reason it doesn't make sense to
inline, I'd name it GetTestViewsDelegate() to indicate that.

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

Hmmm. I was looking more for consistency with the other test classes which also
have test_views_delegate().

[Peter Kasting, 2017/04/06 20:05:33]

That's fine, just inline it then :)

The actual function definition is simple enough that inlining seems reasonable.

[kylix_rd, 2017/04/07 14:07:59]

I'll need to verify that including test_views_delegate.h in the header doesn't
cause any other issues. Right now, TestViewsDelegate is forward declared here in
the header and the .cc file includes the full definition.

[kylix_rd, 2017/04/07 18:33:36]

Done.

+
  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_