OopAsh: fix and enable some more frame-related browser tests.

Bug: 854704
Change-Id: If201f772e7afeb646d619b7917f0f1e134e9edca
Reviewed-on: https://chromium-review.googlesource.com/1149154Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577974}

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc

@@ -872,20 +872,20 @@ IN_PROC_BROWSER_TEST_P(HostedAppNonClientFrameViewAshTest, FocusableViews) {
 
 // Tests that a web app's theme color is set.
 IN_PROC_BROWSER_TEST_P(HostedAppNonClientFrameViewAshTest, ThemeColor) {
-  EXPECT_EQ(GetThemeColor(), frame_header_->active_frame_color_for_testing());
-  EXPECT_EQ(GetThemeColor(), frame_header_->inactive_frame_color_for_testing());
+  aura::Window* window = browser_view_->GetWidget()->GetNativeWindow();
+  EXPECT_EQ(GetThemeColor(),window->GetProperty(ash::kFrameActiveColorKey));
+  EXPECT_EQ(GetThemeColor(), window->GetProperty(ash::kFrameInactiveColorKey));
   EXPECT_EQ(SK_ColorWHITE, GetActiveIconColor(hosted_app_button_container_));
 }
 
-// Make sure that for hosted apps, the height of the frame header and its
-// contents don't exceed the height of the caption buttons.
+// Make sure that for hosted apps, the height of the frame doesn't exceed the
+// height of the caption buttons.
 IN_PROC_BROWSER_TEST_P(HostedAppNonClientFrameViewAshTest, FrameSize) {
-  EXPECT_EQ(frame_header_->GetHeaderHeight(),
+  const int inset = GetFrameViewAsh(browser_view_)->GetTopInset(false);
+  EXPECT_EQ(inset,
             GetAshLayoutSize(ash::AshLayoutSize::kNonBrowserCaption).height());
-  EXPECT_LE(app_menu_button_->size().height(),
-            frame_header_->GetHeaderHeight());
-  EXPECT_LE(hosted_app_button_container_->size().height(),
-            frame_header_->GetHeaderHeight());
+  EXPECT_GE(inset, app_menu_button_->size().height());
+  EXPECT_GE(inset, hosted_app_button_container_->size().height());
 }
 
 // Test that the HostedAppButtonContainer is the designated toolbar button

testing/buildbot/filters/mash.browser_tests.filter

@@ -40,8 +40,6 @@ BrowserNonClientFrameViewAshTest.ImmersiveFullscreen*
 BrowserNonClientFrameViewAshTest.FrameMinSizeIsUpdated*
 
 # Direct access to ash window frames, tablet mode, overview mode, etc.
--ExtensionUninstallDialogViewBrowserTest.BookmarkAppWindowAshCrash
--HostedAppNonClientFrameViewAshTest.*
 -HomeLauncherBrowserNonClientFrameViewAshTest.*
 
 BrowserNonClientFrameViewAshTest.NonClientHitTest*
@@ -51,9 +49,9 @@ BrowserNonClientFrameViewAshTest.AvatarMenuButtonHitTest*
 -ImmersiveModeBrowserViewTest.TestCaptionButtonsReceiveEventsInAppImmersiveMode*
 -ImmersiveModeBrowserViewTest.TestCaptionButtonsReceiveEventsInBrowserImmersiveMode*
 -ImmersiveModeControllerAshHostedAppBrowserTest.*
--FileDisplay/FilesAppBrowserTest.Test/fileDisplayDownloads_TabletMode
--FileDisplay/FilesAppBrowserTest.Test/fileDisplayDrive_TabletMode
--QuickView/FilesAppBrowserTest.Test/openQuickView_TabletMode
+
+# Null immersive_fullscreen_controller_.
+-ChromeNativeAppWindowViewsAuraAshBrowserTest.*
 
 # ash::Shell access from ChromeViewsDelegate::CreateDefaultNonClientFrameView()
 # e.g. from chromeos::CaptivePortalWindowProxy::Show().
@@ -81,9 +79,6 @@ BrowserNonClientFrameViewAshTest.AvatarMenuButtonHitTest*
 # Need screenshot support. http://crbug.com/706246
 -ChromeScreenshotGrabberBrowserTest.*
 
-# Null immersive_fullscreen_controller_.
--ChromeNativeAppWindowViewsAuraAshBrowserTest.*
-
 # Flaky. SessionRestoreStatsCollector::Observe failure. crbug.com/785298
 # session_restore_stats_collector.cc(210) Check failed: 0u < loading_tab_count_ (0 vs. 0)
 -ContinueWhereILeftOffTest.*