Completely rewrite OpaqueBrowserFrameViewLayout unittests.

chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h

Index: chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
index 9d17744861b33570de35616acadd574c0de287c6..8daedf5911ff6dbad79793ceb8f3b1d2f7d79bff 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
@@ -25,6 +25,15 @@ class Label;
 // dependencies with Browser and classes that depend on Browser.
 class OpaqueBrowserFrameViewLayout : public views::LayoutManager {
  public:
+  // Constants public for testing only.
+  static const int kNonClientRestoredExtraThickness;
+  static const int kFrameBorderThickness;
+  static const int kTitlebarTopAndBottomEdgeThickness;
+  static const int kIconLeftSpacing;
+  static const int kIconTitleSpacing;
+  static const int kCaptionSpacing;
+  static const int kNewTabCaptionCondensedSpacing;
+
   explicit OpaqueBrowserFrameViewLayout(
       OpaqueBrowserFrameViewLayoutDelegate* delegate);
   ~OpaqueBrowserFrameViewLayout() override;