Revert of [SP] Temporarily disable two frame navigation tests made flaky by slimming paint.

content/browser/session_history_browsertest.cc

 // 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.
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
@@ skipping 160 matching lines @@
 
   GoForward();
   EXPECT_EQ("bot1", GetTabTitle());
 
   GoForward();
   EXPECT_EQ("bot3", GetTabTitle());
 }
 
 // Test that back/forward works when navigating in subframes.
 // If this flakes, use http://crbug.com/48833
-// TODO(wkorman): Re-enable after fix for http://crbug.com/498938 is in.
-IN_PROC_BROWSER_TEST_F(SessionHistoryTest, DISABLED_FrameBackForward) {
+IN_PROC_BROWSER_TEST_F(SessionHistoryTest, FrameBackForward) {
   ASSERT_FALSE(CanGoBack());
 
   ASSERT_NO_FATAL_FAILURE(NavigateAndCheckTitle("frames.html", "bot1"));
 
   ClickLink("abot2");
   EXPECT_EQ("bot2", GetTabTitle());
   GURL frames(GetURL("frames.html"));
   EXPECT_EQ(frames, GetTabURL());
 
   ClickLink("abot3");
@@ skipping 36 matching lines @@
   EXPECT_EQ("bot2", GetTabTitle());
   EXPECT_EQ(frames, GetTabURL());
 
   GoBack();
   EXPECT_EQ("bot1", GetTabTitle());
   EXPECT_EQ(frames, GetTabURL());
 }
 
 // Test that back/forward preserves POST data and document state in subframes.
 // If this flakes use http://crbug.com/61619
-// TODO(wkorman): Re-enable after fix for http://crbug.com/498938 is in.
-IN_PROC_BROWSER_TEST_F(SessionHistoryTest, DISABLED_FrameFormBackForward) {
+IN_PROC_BROWSER_TEST_F(SessionHistoryTest, FrameFormBackForward) {
   ASSERT_FALSE(CanGoBack());
 
   ASSERT_NO_FATAL_FAILURE(NavigateAndCheckTitle("frames.html", "bot1"));
 
   ClickLink("aform");
   EXPECT_EQ("form", GetTabTitle());
   GURL frames(GetURL("frames.html"));
   EXPECT_EQ(frames, GetTabURL());
 
   SubmitForm("isubmit");
@@ skipping 241 matching lines @@
   NavigateToURL(shell(), GetURL("title2.html"));
 
   ASSERT_TRUE(ExecuteScriptAndExtractInt(
       shell()->web_contents(),
       "domAutomationController.send(history.length)",
       &length));
   EXPECT_EQ(2, length);
 }
 
 }  // namespace content