diff options
| author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 19:45:34 +0000 |
|---|---|---|
| committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 19:45:34 +0000 |
| commit | b148888f20d41d28bdbc1df61d1e47b0f021041c (patch) | |
| tree | 25dc2f2240d6affdb0697a998f27c4572ef1357d | |
| parent | 9d063448acfc3597619e9523c762a79f88165c1d (diff) | |
| download | chromium_src-b148888f20d41d28bdbc1df61d1e47b0f021041c.zip chromium_src-b148888f20d41d28bdbc1df61d1e47b0f021041c.tar.gz chromium_src-b148888f20d41d28bdbc1df61d1e47b0f021041c.tar.bz2 | |
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
| -rw-r--r-- | chrome/browser/autofill/form_structure.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/session_history_uitest.cc | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/chrome/browser/autofill/form_structure.cc b/chrome/browser/autofill/form_structure.cc index 4367e66..da39993 100644 --- a/chrome/browser/autofill/form_structure.cc +++ b/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; diff --git a/chrome/browser/session_history_uitest.cc b/chrome/browser/session_history_uitest.cc index 36d302b..1553b1d 100644 --- a/chrome/browser/session_history_uitest.cc +++ b/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. |