Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/webui/options/core_options_handler.h" | 5 #include "chrome/browser/ui/webui/options/core_options_handler.h" |
| 6 #include "chrome/common/url_constants.h" | 6 #include "chrome/common/url_constants.h" |
| 7 #include "chrome/test/ui_test_utils.h" | 7 #include "chrome/test/ui_test_utils.h" |
| 8 #include "content/browser/webui/web_ui_browsertest.h" | 8 #include "content/browser/webui/web_ui_browsertest.h" |
| 9 #include "googleurl/src/gurl.h" | 9 #include "googleurl/src/gurl.h" |
| 10 #include "testing/gmock/include/gmock/gmock.h" | 10 #include "testing/gmock/include/gmock/gmock.h" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 64 } | 64 } |
| 65 }; | 65 }; |
| 66 | 66 |
| 67 class SettingsWebUITest : public WebUIBrowserTest { | 67 class SettingsWebUITest : public WebUIBrowserTest { |
| 68 protected: | 68 protected: |
| 69 virtual void SetUpInProcessBrowserTestFixture() { | 69 virtual void SetUpInProcessBrowserTestFixture() { |
| 70 WebUIBrowserTest::SetUpInProcessBrowserTestFixture(); | 70 WebUIBrowserTest::SetUpInProcessBrowserTestFixture(); |
| 71 AddLibrary(FILE_PATH_LITERAL("settings.js")); | 71 AddLibrary(FILE_PATH_LITERAL("settings.js")); |
| 72 } | 72 } |
| 73 | 73 |
| 74 virtual WebUIMessageHandler* GetMockMessageHandler() { | 74 virtual void SetUpOnMainThread() { |
| 75 return &mock_core_options_handler_; | 75 mock_core_options_handler_.reset(new StrictMock<MockCoreOptionsHandler>()); |
| 76 } | 76 } |
| 77 | 77 |
| 78 StrictMock<MockCoreOptionsHandler> mock_core_options_handler_; | 78 virtual void CleanUpOnMainThread() { |
| 79 mock_core_options_handler_.reset(); | |
| 80 } | |
| 81 | |
| 82 virtual WebUIMessageHandler* GetMockMessageHandler() { | |
| 83 return mock_core_options_handler_.get(); | |
| 84 } | |
| 85 | |
| 86 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
| |
| 79 }; | 87 }; |
| 80 | 88 |
| 81 // Test the end to end js to WebUI handler code path for | 89 // Test the end to end js to WebUI handler code path for |
| 82 // the message setBooleanPref. | 90 // the message setBooleanPref. |
| 83 // TODO(dtseng): add more EXPECT_CALL's when updating js test. | 91 // TODO(dtseng): add more EXPECT_CALL's when updating js test. |
| 84 | 92 |
| 85 // Crashes on Mac only. See http://crbug.com/79181 | 93 // Crashes on Mac only. See http://crbug.com/79181 |
| 86 #if defined(OS_MACOSX) | 94 #if defined(OS_MACOSX) |
| 87 #define MAYBE_TestSetBooleanPrefTriggers DISABLED_TestSetBooleanPrefTriggers | 95 #define MAYBE_TestSetBooleanPrefTriggers DISABLED_TestSetBooleanPrefTriggers |
| 88 #else | 96 #else |
| 89 #define MAYBE_TestSetBooleanPrefTriggers TestSetBooleanPrefTriggers | 97 #define MAYBE_TestSetBooleanPrefTriggers TestSetBooleanPrefTriggers |
| 90 #endif | 98 #endif |
| 91 IN_PROC_BROWSER_TEST_F(SettingsWebUITest, MAYBE_TestSetBooleanPrefTriggers) { | 99 IN_PROC_BROWSER_TEST_F(SettingsWebUITest, MAYBE_TestSetBooleanPrefTriggers) { |
| 92 // This serves as an example of a very constrained test. | 100 // This serves as an example of a very constrained test. |
| 93 ListValue true_list_value; | 101 ListValue true_list_value; |
| 94 true_list_value.Append(Value::CreateStringValue("browser.show_home_button")); | 102 true_list_value.Append(Value::CreateStringValue("browser.show_home_button")); |
| 95 true_list_value.Append(Value::CreateBooleanValue(true)); | 103 true_list_value.Append(Value::CreateBooleanValue(true)); |
| 96 true_list_value.Append( | 104 true_list_value.Append( |
| 97 Value::CreateStringValue("Options_Homepage_HomeButton")); | 105 Value::CreateStringValue("Options_Homepage_HomeButton")); |
| 98 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUISettingsURL)); | 106 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUISettingsURL)); |
| 99 EXPECT_CALL(mock_core_options_handler_, | 107 EXPECT_CALL(*mock_core_options_handler_, |
| 100 HandleSetBooleanPref(Eq_ListValue(&true_list_value))); | 108 HandleSetBooleanPref(Eq_ListValue(&true_list_value))); |
| 101 ASSERT_TRUE(RunJavascriptTest("testSetBooleanPrefTriggers")); | 109 ASSERT_TRUE(RunJavascriptTest("testSetBooleanPrefTriggers")); |
| 102 } | 110 } |
| OLD | NEW |