diff options
| author | dtseng@chromium.org <dtseng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-05 23:23:04 +0000 |
|---|---|---|
| committer | dtseng@chromium.org <dtseng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-05 23:23:04 +0000 |
| commit | 7ddfb14ea2a8533283373c74c40593a703419ec0 (patch) | |
| tree | 278cfd32aba06cbd325ddd795d0606ece77e7168 /chrome/browser/ui | |
| parent | 93a602c9dc5f0fc69ea32d3b92c028fbe4e96979 (diff) | |
| download | chromium_src-7ddfb14ea2a8533283373c74c40593a703419ec0.zip chromium_src-7ddfb14ea2a8533283373c74c40593a703419ec0.tar.gz chromium_src-7ddfb14ea2a8533283373c74c40593a703419ec0.tar.bz2 | |
Reenable passing test SettingsWebUITest.SetBooleanPrefTriggers.
BUG=77764
TEST=repeated runs on try bots. Passing for the past two days on Win, Mac, and Linux.
TBR=jam
Review URL: http://codereview.chromium.org/6735073
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80544 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/webui/settings_browsertest.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/ui/webui/settings_browsertest.cc b/chrome/browser/ui/webui/settings_browsertest.cc index 21ae2f8..ad550cbf 100644 --- a/chrome/browser/ui/webui/settings_browsertest.cc +++ b/chrome/browser/ui/webui/settings_browsertest.cc @@ -78,16 +78,10 @@ class SettingsWebUITest : public WebUIBrowserTest { StrictMock<MockCoreOptionsHandler> mock_core_options_handler_; }; -// Crashes on Mac only. http://crbug.com/77764 -#if defined(OS_MACOSX) -#define MAYBE_TestSetBooleanPrefTriggers DISABLED_TestSetBooleanPrefTriggers -#else -#define MAYBE_TestSetBooleanPrefTriggers TestSetBooleanPrefTriggers -#endif // Test the end to end js to WebUI handler code path for // the message setBooleanPref. // TODO(dtseng): add more EXPECT_CALL's when updating js test. -IN_PROC_BROWSER_TEST_F(SettingsWebUITest, MAYBE_TestSetBooleanPrefTriggers) { +IN_PROC_BROWSER_TEST_F(SettingsWebUITest, TestSetBooleanPrefTriggers) { // This serves as an example of a very constrained test. ListValue true_list_value; true_list_value.Append(Value::CreateStringValue("browser.show_home_button")); |