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

BUG=70883
TEST=none

Review URL: http://codereview.chromium.org/6273015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72671 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/autofill/form_structure.cc

@@ -108,7 +108,7 @@ bool FormStructure::EncodeUploadRequest(bool auto_fill_used,
                                         std::string* encoded_xml) const {
   DCHECK(encoded_xml);
   encoded_xml->clear();
-  bool auto_fillable = IsAutoFillable(false);
+  bool auto_fillable = ShouldBeParsed(true);
   DCHECK(auto_fillable);  // Caller should've checked for search pages.
   if (!auto_fillable)
     return false;

chrome/browser/session_history_uitest.cc

@@ -144,9 +144,15 @@ TEST_F(SessionHistoryTest, MAYBE_BasicBackForward) {
   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.