Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Side by Side Diff: chrome/browser/dom_ui/settings_browsertest.cc

Issue 6480046: WebUI: Change more references to WebUI in dom_ui directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/dom_ui/net_internals_ui.cc ('k') | chrome/browser/dom_ui/web_ui_browsertest.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/dom_ui/dom_ui_browsertest.h" 5 #include "chrome/browser/dom_ui/web_ui_browsertest.h"
6 #include "chrome/browser/dom_ui/options/core_options_handler.h" 6 #include "chrome/browser/dom_ui/options/core_options_handler.h"
7 #include "chrome/common/url_constants.h" 7 #include "chrome/common/url_constants.h"
8 #include "chrome/test/ui_test_utils.h" 8 #include "chrome/test/ui_test_utils.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"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 using ::testing::StrictMock; 13 using ::testing::StrictMock;
14 using ::testing::_; 14 using ::testing::_;
15 15
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 NewCallback(this, &MockCoreOptionsHandler ::HandleSetStringPref)); 57 NewCallback(this, &MockCoreOptionsHandler ::HandleSetStringPref));
58 dom_ui_->RegisterMessageCallback("setObjectPref", 58 dom_ui_->RegisterMessageCallback("setObjectPref",
59 NewCallback(this, &MockCoreOptionsHandler ::HandleSetObjectPref)); 59 NewCallback(this, &MockCoreOptionsHandler ::HandleSetObjectPref));
60 dom_ui_->RegisterMessageCallback("clearPref", 60 dom_ui_->RegisterMessageCallback("clearPref",
61 NewCallback(this, &MockCoreOptionsHandler ::HandleClearPref)); 61 NewCallback(this, &MockCoreOptionsHandler ::HandleClearPref));
62 dom_ui_->RegisterMessageCallback("coreOptionsUserMetricsAction", 62 dom_ui_->RegisterMessageCallback("coreOptionsUserMetricsAction",
63 NewCallback(this, &MockCoreOptionsHandler ::HandleUserMetricsAction)); 63 NewCallback(this, &MockCoreOptionsHandler ::HandleUserMetricsAction));
64 } 64 }
65 }; 65 };
66 66
67 class SettingsWebUITest : public DOMUITest { 67 class SettingsWebUITest : public WebUIBrowserTest {
68 protected: 68 protected:
69 virtual WebUIMessageHandler* GetMockMessageHandler() { 69 virtual WebUIMessageHandler* GetMockMessageHandler() {
70 return &mock_core_options_handler_; 70 return &mock_core_options_handler_;
71 } 71 }
72 72
73 StrictMock<MockCoreOptionsHandler> mock_core_options_handler_; 73 StrictMock<MockCoreOptionsHandler> mock_core_options_handler_;
74 }; 74 };
75 75
76 // Test the end to end js to WebUI handler code path for 76 // Test the end to end js to WebUI handler code path for
77 // the message setBooleanPref. 77 // the message setBooleanPref.
78 // TODO(dtseng): add more EXPECT_CALL's when updating js test. 78 // TODO(dtseng): add more EXPECT_CALL's when updating js test.
79 IN_PROC_BROWSER_TEST_F(SettingsWebUITest, TestSetBooleanPrefTriggers) { 79 IN_PROC_BROWSER_TEST_F(SettingsWebUITest, TestSetBooleanPrefTriggers) {
80 // This serves as an example of a very constrained test. 80 // This serves as an example of a very constrained test.
81 ListValue true_list_value; 81 ListValue true_list_value;
82 true_list_value.Append(Value::CreateStringValue("browser.show_home_button")); 82 true_list_value.Append(Value::CreateStringValue("browser.show_home_button"));
83 true_list_value.Append(Value::CreateBooleanValue(true)); 83 true_list_value.Append(Value::CreateBooleanValue(true));
84 true_list_value.Append( 84 true_list_value.Append(
85 Value::CreateStringValue("Options_Homepage_HomeButton")); 85 Value::CreateStringValue("Options_Homepage_HomeButton"));
86 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUISettingsURL)); 86 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUISettingsURL));
87 EXPECT_CALL(mock_core_options_handler_, 87 EXPECT_CALL(mock_core_options_handler_,
88 HandleSetBooleanPref(Eq_ListValue(&true_list_value))); 88 HandleSetBooleanPref(Eq_ListValue(&true_list_value)));
89 ASSERT_TRUE(RunDOMUITest( 89 ASSERT_TRUE(RunWebUITest(
90 FILE_PATH_LITERAL("settings_set_boolean_pref_triggers.js"))); 90 FILE_PATH_LITERAL("settings_set_boolean_pref_triggers.js")));
91 } 91 }
92 92
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/net_internals_ui.cc ('k') | chrome/browser/dom_ui/web_ui_browsertest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698