Match FormStructure DCHECK to AutoFillManager's check in OnFormSubmitted()

chrome/browser/session_history_uitest.cc

 // Copyright (c) 2010 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/string_util.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "grit/generated_resources.h"
@@ skipping 126 matching lines @@
   ASSERT_FALSE(tab_->GoBack());
   EXPECT_EQ(L"", GetTabTitle());
 
   ASSERT_TRUE(tab_->GoForward());
   EXPECT_EQ(L"bot1", GetTabTitle());
 
   ASSERT_TRUE(tab_->GoForward());
   EXPECT_EQ(L"bot3", GetTabTitle());
 }
 
+#if defined(OS_WIN)
+// See http://crbug.com/61619
+#define MAYBE_FrameBackForward FLAKY_FrameBackForward
+#else
+#define MAYBE_FrameBackForward FrameBackForward
+#endif
+
 // Test that back/forward works when navigating in subframes.
-// Flaky, http://crbug.com/61619 and http://crbug.com/70883.
-TEST_F(SessionHistoryTest, FLAKY_FrameBackForward) {
+TEST_F(SessionHistoryTest, MAYBE_FrameBackForward) {
   ASSERT_TRUE(test_server_.Start());
 
   // about:blank should be loaded first.
   GURL home(homepage());
   ASSERT_FALSE(tab_->GoBack());
   EXPECT_EQ(L"", GetTabTitle());
   EXPECT_EQ(home, GetTabURL());
 
   GURL frames(test_server_.GetURL("files/session_history/frames.html"));
   ASSERT_TRUE(tab_->NavigateToURL(frames));
@@ skipping 398 matching lines @@
   ASSERT_TRUE(tab_->GoBack());
 
   // Ensure history.length is properly truncated.
   ASSERT_TRUE(tab_->NavigateToURL(test_server_.GetURL("files/title2.html")));
   ASSERT_TRUE(tab_->ExecuteAndExtractInt(
       L"", L"domAutomationController.send(history.length)", &length));
   EXPECT_EQ(2, length);
 }
 
 }  // namespace