OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <string> | 5 #include <string> |
6 | 6 |
7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "chrome/browser/download/download_prefs.h" | 9 #include "chrome/browser/download/download_prefs.h" |
10 #include "chrome/browser/prefs/pref_service_syncable.h" | 10 #include "chrome/browser/prefs/pref_service_syncable.h" |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 browser()->profile()->GetPrefs()->SetBoolean(prefs::kNetworkPredictionEnabled, | 132 browser()->profile()->GetPrefs()->SetBoolean(prefs::kNetworkPredictionEnabled, |
133 false); | 133 false); |
134 EXPECT_FALSE(browser()->profile()->GetPrefs()->GetBoolean( | 134 EXPECT_FALSE(browser()->profile()->GetPrefs()->GetBoolean( |
135 prefs::kNetworkPredictionEnabled)); | 135 prefs::kNetworkPredictionEnabled)); |
136 } | 136 } |
137 | 137 |
138 // Verify restore for bookmark bar visibility. | 138 // Verify restore for bookmark bar visibility. |
139 IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, | 139 IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, |
140 TestSessionRestoreShowBookmarkBar) { | 140 TestSessionRestoreShowBookmarkBar) { |
141 EXPECT_FALSE(browser()->profile()->GetPrefs()->GetBoolean( | 141 EXPECT_FALSE(browser()->profile()->GetPrefs()->GetBoolean( |
142 prefs::kShowBookmarkBar)); | 142 bookmarks::prefs::kShowBookmarkBar)); |
143 browser()->profile()->GetPrefs()->SetBoolean(prefs::kShowBookmarkBar, true); | 143 browser()->profile()->GetPrefs()->SetBoolean( |
| 144 bookmarks::prefs::kShowBookmarkBar, true); |
144 EXPECT_TRUE(browser()->profile()->GetPrefs()->GetBoolean( | 145 EXPECT_TRUE(browser()->profile()->GetPrefs()->GetBoolean( |
145 prefs::kShowBookmarkBar)); | 146 bookmarks::prefs::kShowBookmarkBar)); |
146 | 147 |
147 EXPECT_TRUE(browser()->profile()->GetPrefs()->GetBoolean( | 148 EXPECT_TRUE(browser()->profile()->GetPrefs()->GetBoolean( |
148 prefs::kShowBookmarkBar)); | 149 bookmarks::prefs::kShowBookmarkBar)); |
149 EXPECT_EQ(BookmarkBar::SHOW, browser()->bookmark_bar_state()); | 150 EXPECT_EQ(BookmarkBar::SHOW, browser()->bookmark_bar_state()); |
150 } | 151 } |
151 | 152 |
152 // Verify images are not blocked in incognito mode. | 153 // Verify images are not blocked in incognito mode. |
153 IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, TestImagesNotBlockedInIncognito) { | 154 IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, TestImagesNotBlockedInIncognito) { |
154 ASSERT_TRUE(test_server()->Start()); | 155 ASSERT_TRUE(test_server()->Start()); |
155 GURL url = test_server()->GetURL("files/settings/image_page.html"); | 156 GURL url = test_server()->GetURL("files/settings/image_page.html"); |
156 Browser* incognito_browser = CreateIncognitoBrowser(); | 157 Browser* incognito_browser = CreateIncognitoBrowser(); |
157 ui_test_utils::NavigateToURLWithDisposition( | 158 ui_test_utils::NavigateToURLWithDisposition( |
158 incognito_browser, | 159 incognito_browser, |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
235 EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled)); | 236 EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled)); |
236 EXPECT_FALSE(prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled)); | 237 EXPECT_FALSE(prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled)); |
237 EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); | 238 EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); |
238 } | 239 } |
239 | 240 |
240 // Verify that we have some Local State prefs. | 241 // Verify that we have some Local State prefs. |
241 IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, TestHaveLocalStatePrefs) { | 242 IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, TestHaveLocalStatePrefs) { |
242 EXPECT_TRUE(g_browser_process->local_state()->GetPreferenceValues().get()); | 243 EXPECT_TRUE(g_browser_process->local_state()->GetPreferenceValues().get()); |
243 } | 244 } |
244 | 245 |
OLD | NEW |