OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/prefs/pref_service.h" | 5 #include "base/prefs/pref_service.h" |
6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
7 #include "chrome/browser/browser_process.h" | 7 #include "chrome/browser/browser_process.h" |
8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" |
9 #include "chrome/browser/extensions/extension_apitest.h" | 9 #include "chrome/browser/extensions/extension_apitest.h" |
10 #include "chrome/browser/extensions/extension_test_message_listener.h" | 10 #include "chrome/browser/extensions/extension_test_message_listener.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 ExtensionPreferenceApiTest() : profile_(NULL) {} | 29 ExtensionPreferenceApiTest() : profile_(NULL) {} |
30 | 30 |
31 void CheckPreferencesSet() { | 31 void CheckPreferencesSet() { |
32 PrefService* prefs = profile_->GetPrefs(); | 32 PrefService* prefs = profile_->GetPrefs(); |
33 const PrefService::Preference* pref = prefs->FindPreference( | 33 const PrefService::Preference* pref = prefs->FindPreference( |
34 prefs::kBlockThirdPartyCookies); | 34 prefs::kBlockThirdPartyCookies); |
35 ASSERT_TRUE(pref); | 35 ASSERT_TRUE(pref); |
36 EXPECT_TRUE(pref->IsExtensionControlled()); | 36 EXPECT_TRUE(pref->IsExtensionControlled()); |
37 EXPECT_TRUE(prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled)); | 37 EXPECT_TRUE(prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled)); |
38 EXPECT_TRUE(prefs->GetBoolean(autofill::prefs::kAutofillEnabled)); | 38 EXPECT_TRUE(prefs->GetBoolean(autofill::prefs::kAutofillEnabled)); |
| 39 EXPECT_TRUE(prefs->GetBoolean( |
| 40 password_manager::prefs::kPasswordManagerEnabled)); |
39 EXPECT_FALSE(prefs->GetBoolean(prefs::kBlockThirdPartyCookies)); | 41 EXPECT_FALSE(prefs->GetBoolean(prefs::kBlockThirdPartyCookies)); |
40 EXPECT_TRUE(prefs->GetBoolean(prefs::kEnableHyperlinkAuditing)); | 42 EXPECT_TRUE(prefs->GetBoolean(prefs::kEnableHyperlinkAuditing)); |
41 EXPECT_TRUE(prefs->GetBoolean(prefs::kEnableReferrers)); | 43 EXPECT_TRUE(prefs->GetBoolean(prefs::kEnableReferrers)); |
42 EXPECT_TRUE(prefs->GetBoolean(prefs::kEnableTranslate)); | 44 EXPECT_TRUE(prefs->GetBoolean(prefs::kEnableTranslate)); |
43 EXPECT_TRUE(prefs->GetBoolean(prefs::kNetworkPredictionEnabled)); | 45 EXPECT_TRUE(prefs->GetBoolean(prefs::kNetworkPredictionEnabled)); |
44 EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled)); | 46 EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled)); |
45 EXPECT_TRUE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); | 47 EXPECT_TRUE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); |
46 } | 48 } |
47 | 49 |
48 void CheckPreferencesCleared() { | 50 void CheckPreferencesCleared() { |
49 PrefService* prefs = profile_->GetPrefs(); | 51 PrefService* prefs = profile_->GetPrefs(); |
50 const PrefService::Preference* pref = prefs->FindPreference( | 52 const PrefService::Preference* pref = prefs->FindPreference( |
51 prefs::kBlockThirdPartyCookies); | 53 prefs::kBlockThirdPartyCookies); |
52 ASSERT_TRUE(pref); | 54 ASSERT_TRUE(pref); |
53 EXPECT_FALSE(pref->IsExtensionControlled()); | 55 EXPECT_FALSE(pref->IsExtensionControlled()); |
54 EXPECT_FALSE(prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled)); | 56 EXPECT_FALSE(prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled)); |
55 EXPECT_FALSE(prefs->GetBoolean(autofill::prefs::kAutofillEnabled)); | 57 EXPECT_FALSE(prefs->GetBoolean(autofill::prefs::kAutofillEnabled)); |
| 58 EXPECT_FALSE(prefs->GetBoolean( |
| 59 password_manager::prefs::kPasswordManagerEnabled)); |
56 EXPECT_TRUE(prefs->GetBoolean(prefs::kBlockThirdPartyCookies)); | 60 EXPECT_TRUE(prefs->GetBoolean(prefs::kBlockThirdPartyCookies)); |
57 EXPECT_FALSE(prefs->GetBoolean(prefs::kEnableHyperlinkAuditing)); | 61 EXPECT_FALSE(prefs->GetBoolean(prefs::kEnableHyperlinkAuditing)); |
58 EXPECT_FALSE(prefs->GetBoolean(prefs::kEnableReferrers)); | 62 EXPECT_FALSE(prefs->GetBoolean(prefs::kEnableReferrers)); |
59 EXPECT_FALSE(prefs->GetBoolean(prefs::kEnableTranslate)); | 63 EXPECT_FALSE(prefs->GetBoolean(prefs::kEnableTranslate)); |
60 EXPECT_FALSE(prefs->GetBoolean(prefs::kNetworkPredictionEnabled)); | 64 EXPECT_FALSE(prefs->GetBoolean(prefs::kNetworkPredictionEnabled)); |
61 EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled)); | 65 EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled)); |
62 EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); | 66 EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); |
63 } | 67 } |
64 | 68 |
65 virtual void SetUpOnMainThread() OVERRIDE { | 69 virtual void SetUpOnMainThread() OVERRIDE { |
(...skipping 25 matching lines...) Expand all Loading... |
91 // http://crbug.com/177163 | 95 // http://crbug.com/177163 |
92 #if defined(OS_WIN) && !defined(NDEBUG) | 96 #if defined(OS_WIN) && !defined(NDEBUG) |
93 #define MAYBE_Standard DISABLED_Standard | 97 #define MAYBE_Standard DISABLED_Standard |
94 #else | 98 #else |
95 #define MAYBE_Standard Standard | 99 #define MAYBE_Standard Standard |
96 #endif | 100 #endif |
97 IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, MAYBE_Standard) { | 101 IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, MAYBE_Standard) { |
98 PrefService* prefs = profile_->GetPrefs(); | 102 PrefService* prefs = profile_->GetPrefs(); |
99 prefs->SetBoolean(prefs::kAlternateErrorPagesEnabled, false); | 103 prefs->SetBoolean(prefs::kAlternateErrorPagesEnabled, false); |
100 prefs->SetBoolean(autofill::prefs::kAutofillEnabled, false); | 104 prefs->SetBoolean(autofill::prefs::kAutofillEnabled, false); |
| 105 prefs->SetBoolean(password_manager::prefs::kPasswordManagerEnabled, false); |
101 prefs->SetBoolean(prefs::kBlockThirdPartyCookies, true); | 106 prefs->SetBoolean(prefs::kBlockThirdPartyCookies, true); |
102 prefs->SetBoolean(prefs::kEnableHyperlinkAuditing, false); | 107 prefs->SetBoolean(prefs::kEnableHyperlinkAuditing, false); |
103 prefs->SetBoolean(prefs::kEnableReferrers, false); | 108 prefs->SetBoolean(prefs::kEnableReferrers, false); |
104 prefs->SetBoolean(prefs::kEnableTranslate, false); | 109 prefs->SetBoolean(prefs::kEnableTranslate, false); |
105 prefs->SetBoolean(prefs::kNetworkPredictionEnabled, false); | 110 prefs->SetBoolean(prefs::kNetworkPredictionEnabled, false); |
106 prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false); | 111 prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false); |
107 prefs->SetBoolean(prefs::kSearchSuggestEnabled, false); | 112 prefs->SetBoolean(prefs::kSearchSuggestEnabled, false); |
108 | 113 |
109 const char kExtensionPath[] = "preference/standard"; | 114 const char kExtensionPath[] = "preference/standard"; |
110 | 115 |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
310 | 315 |
311 // Test 6 - clearDefault | 316 // Test 6 - clearDefault |
312 EXPECT_TRUE(listener10.WaitUntilSatisfied()); // Regular ready | 317 EXPECT_TRUE(listener10.WaitUntilSatisfied()); // Regular ready |
313 EXPECT_TRUE(listener_incognito10.WaitUntilSatisfied()); // Incognito ready | 318 EXPECT_TRUE(listener_incognito10.WaitUntilSatisfied()); // Incognito ready |
314 listener10.Reply("ok"); | 319 listener10.Reply("ok"); |
315 listener_incognito10.Reply("ok"); | 320 listener_incognito10.Reply("ok"); |
316 | 321 |
317 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 322 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
318 EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message(); | 323 EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message(); |
319 } | 324 } |
OLD | NEW |