Index: chrome/browser/ui/webui/settings_browsertest.cc |
diff --git a/chrome/browser/ui/webui/settings_browsertest.cc b/chrome/browser/ui/webui/settings_browsertest.cc |
index 87e3da89df17a8ba0019bc6da462c9dab4477781..c8593ffe3ef0b6e26591ac8af7382b678b5544c6 100644 |
--- a/chrome/browser/ui/webui/settings_browsertest.cc |
+++ b/chrome/browser/ui/webui/settings_browsertest.cc |
@@ -71,11 +71,19 @@ class SettingsWebUITest : public WebUIBrowserTest { |
AddLibrary(FILE_PATH_LITERAL("settings.js")); |
} |
+ virtual void SetUpOnMainThread() { |
+ mock_core_options_handler_.reset(new StrictMock<MockCoreOptionsHandler>()); |
+ } |
+ |
+ virtual void CleanUpOnMainThread() { |
+ mock_core_options_handler_.reset(); |
+ } |
+ |
virtual WebUIMessageHandler* GetMockMessageHandler() { |
- return &mock_core_options_handler_; |
+ return mock_core_options_handler_.get(); |
} |
- StrictMock<MockCoreOptionsHandler> mock_core_options_handler_; |
+ scoped_ptr<StrictMock<MockCoreOptionsHandler> > mock_core_options_handler_; |
Evan Stade
2011/04/15 19:15:11
why is this change needed?
Bernhard Bauer
2011/04/17 13:26:54
PluginDataRemoverHelper needs to be destructed on
|
}; |
// Test the end to end js to WebUI handler code path for |
@@ -96,7 +104,7 @@ IN_PROC_BROWSER_TEST_F(SettingsWebUITest, MAYBE_TestSetBooleanPrefTriggers) { |
true_list_value.Append( |
Value::CreateStringValue("Options_Homepage_HomeButton")); |
ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUISettingsURL)); |
- EXPECT_CALL(mock_core_options_handler_, |
+ EXPECT_CALL(*mock_core_options_handler_, |
HandleSetBooleanPref(Eq_ListValue(&true_list_value))); |
ASSERT_TRUE(RunJavascriptTest("testSetBooleanPrefTriggers")); |
} |