Chromium Code Reviews| 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/utf_string_conversions.h" | 5 #include "base/utf_string_conversions.h" |
| 6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
| 7 #include "chrome/browser/extensions/extension_test_message_listener.h" | |
|
Bernhard Bauer
2012/06/26 08:44:29
I think you forgot to add this file to the CL?
mitchellwrosen
2012/06/26 17:32:52
I didn't write it!
Bernhard Bauer
2012/06/26 20:09:55
Oh, sorry, I thought it was new 0:-)
| |
| 7 #include "chrome/browser/prefs/pref_service.h" | 8 #include "chrome/browser/prefs/pref_service.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/common/chrome_switches.h" | 11 #include "chrome/common/chrome_switches.h" |
| 11 #include "chrome/common/pref_names.h" | 12 #include "chrome/common/pref_names.h" |
| 13 #include "chrome/test/base/ui_test_utils.h" | |
| 12 #include "webkit/plugins/npapi/mock_plugin_list.h" | 14 #include "webkit/plugins/npapi/mock_plugin_list.h" |
| 13 | 15 |
| 14 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PreferenceApi) { | 16 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PreferenceApi) { |
| 15 PrefService* pref_service = browser()->profile()->GetPrefs(); | 17 PrefService* pref_service = browser()->profile()->GetPrefs(); |
| 16 pref_service->SetBoolean(prefs::kAlternateErrorPagesEnabled, false); | 18 pref_service->SetBoolean(prefs::kAlternateErrorPagesEnabled, false); |
| 17 pref_service->SetBoolean(prefs::kAutofillEnabled, false); | 19 pref_service->SetBoolean(prefs::kAutofillEnabled, false); |
| 18 pref_service->SetBoolean(prefs::kBlockThirdPartyCookies, true); | 20 pref_service->SetBoolean(prefs::kBlockThirdPartyCookies, true); |
| 19 pref_service->SetBoolean(prefs::kEnableHyperlinkAuditing, false); | 21 pref_service->SetBoolean(prefs::kEnableHyperlinkAuditing, false); |
| 20 pref_service->SetBoolean(prefs::kEnableReferrers, false); | 22 pref_service->SetBoolean(prefs::kEnableReferrers, false); |
| 21 pref_service->SetBoolean(prefs::kEnableTranslate, false); | 23 pref_service->SetBoolean(prefs::kEnableTranslate, false); |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 103 EXPECT_TRUE(RunExtensionTest("preference/clear")) << message_; | 105 EXPECT_TRUE(RunExtensionTest("preference/clear")) << message_; |
| 104 | 106 |
| 105 const PrefService::Preference* pref = pref_service->FindPreference( | 107 const PrefService::Preference* pref = pref_service->FindPreference( |
| 106 prefs::kBlockThirdPartyCookies); | 108 prefs::kBlockThirdPartyCookies); |
| 107 ASSERT_TRUE(pref); | 109 ASSERT_TRUE(pref); |
| 108 EXPECT_FALSE(pref->IsExtensionControlled()); | 110 EXPECT_FALSE(pref->IsExtensionControlled()); |
| 109 EXPECT_EQ(true, pref_service->GetBoolean(prefs::kBlockThirdPartyCookies)); | 111 EXPECT_EQ(true, pref_service->GetBoolean(prefs::kBlockThirdPartyCookies)); |
| 110 } | 112 } |
| 111 | 113 |
| 112 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PreferenceOnChange) { | 114 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PreferenceOnChange) { |
| 113 PrefService* prefs = browser()->profile()->GetPrefs(); | |
| 114 prefs->SetBoolean(prefs::kBlockThirdPartyCookies, false); | |
| 115 | |
| 116 EXPECT_TRUE(RunExtensionTestIncognito("preference/onchange")) << | 115 EXPECT_TRUE(RunExtensionTestIncognito("preference/onchange")) << |
| 117 message_; | 116 message_; |
| 118 } | 117 } |
| 118 | |
| 119 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PreferenceOnChangeSplit) { | |
| 120 ResultCatcher catcher; | |
| 121 catcher.RestrictToProfile(browser()->profile()); | |
| 122 ResultCatcher catcher_incognito; | |
| 123 catcher_incognito.RestrictToProfile( | |
| 124 browser()->profile()->GetOffTheRecordProfile()); | |
| 125 | |
| 126 // Open an incognito window. | |
| 127 ui_test_utils::OpenURLOffTheRecord(browser()->profile(), | |
| 128 GURL("chrome://newtab/")); | |
| 129 | |
| 130 // changeDefault listeners. | |
| 131 ExtensionTestMessageListener listener1("changeDefault regular ready", true); | |
| 132 ExtensionTestMessageListener listener_incognito1( | |
| 133 "changeDefault incognito ready", true); | |
| 134 | |
| 135 // changeIncognitoOnly listeners. | |
| 136 ExtensionTestMessageListener listener2( | |
| 137 "changeIncognitoOnly regular ready", true); | |
| 138 ExtensionTestMessageListener listener_incognito2( | |
| 139 "changeIncognitoOnly incognito ready", true); | |
| 140 ExtensionTestMessageListener listener3( | |
| 141 "changeIncognitoOnly regular listening", true); | |
| 142 ExtensionTestMessageListener listener_incognito3( | |
| 143 "changeIncognitoOnly incognito pref set", false); | |
| 144 | |
| 145 // changeDefaultOnly listeners. | |
| 146 ExtensionTestMessageListener listener4( | |
| 147 "changeDefaultOnly regular ready", true); | |
| 148 ExtensionTestMessageListener listener_incognito4( | |
| 149 "changeDefaultOnly incognito ready", true); | |
| 150 ExtensionTestMessageListener listener5( | |
| 151 "changeDefaultOnly pref set", false); | |
| 152 ExtensionTestMessageListener listener_incognito5( | |
| 153 "changeDefaultOnly incognito listening", true); | |
| 154 | |
| 155 // changeIncognitoOnlyBack listeners. | |
| 156 ExtensionTestMessageListener listener6( | |
| 157 "changeIncognitoOnlyBack regular ready", true); | |
| 158 ExtensionTestMessageListener listener_incognito6( | |
| 159 "changeIncognitoOnlyBack incognito ready", true); | |
| 160 ExtensionTestMessageListener listener7( | |
| 161 "changeIncognitoOnlyBack regular listening", true); | |
| 162 ExtensionTestMessageListener listener_incognito7( | |
| 163 "changeIncognitoOnlyBack incognito pref set", false); | |
| 164 | |
| 165 // clearIncognito listeners. | |
| 166 ExtensionTestMessageListener listener8( | |
| 167 "clearIncognito regular ready", true); | |
| 168 ExtensionTestMessageListener listener_incognito8( | |
| 169 "clearIncognito incognito ready", true); | |
| 170 ExtensionTestMessageListener listener9( | |
| 171 "clearIncognito regular listening", true); | |
| 172 ExtensionTestMessageListener listener_incognito9( | |
| 173 "clearIncognito incognito pref cleared", false); | |
| 174 | |
| 175 // clearDefault listeners. | |
| 176 ExtensionTestMessageListener listener10( | |
| 177 "clearDefault regular ready", true); | |
| 178 ExtensionTestMessageListener listener_incognito10( | |
| 179 "clearDefault incognito ready", true); | |
| 180 | |
| 181 ASSERT_TRUE(LoadExtensionIncognito(test_data_dir_ | |
|
Bernhard Bauer
2012/06/26 08:44:29
Nit: This is a bit awkwardly broken. Could you ext
mitchellwrosen
2012/06/26 17:32:52
Done.
| |
| 182 .AppendASCII("preference").AppendASCII("onchange_split"))); | |
| 183 | |
| 184 // Test 1 - changeDefault | |
| 185 EXPECT_TRUE(listener1.WaitUntilSatisfied()); // Regular ready | |
| 186 EXPECT_TRUE(listener_incognito1.WaitUntilSatisfied()); // Incognito ready | |
| 187 listener1.Reply("ok"); | |
| 188 listener_incognito1.Reply("ok"); | |
| 189 | |
| 190 // Test 2 - changeIncognitoOnly | |
| 191 EXPECT_TRUE(listener2.WaitUntilSatisfied()); // Regular ready | |
| 192 EXPECT_TRUE(listener_incognito2.WaitUntilSatisfied()); // Incognito ready | |
| 193 EXPECT_TRUE(listener3.WaitUntilSatisfied()); // Regular listening | |
| 194 listener2.Reply("ok"); | |
| 195 listener_incognito2.Reply("ok"); | |
| 196 // Incognito preference set -- notify the regular listener | |
| 197 EXPECT_TRUE(listener_incognito3.WaitUntilSatisfied()); | |
| 198 listener3.Reply("ok"); | |
| 199 | |
| 200 // Test 3 - changeDefaultOnly | |
| 201 EXPECT_TRUE(listener4.WaitUntilSatisfied()); // Regular ready | |
| 202 EXPECT_TRUE(listener_incognito4.WaitUntilSatisfied()); // Incognito ready | |
| 203 EXPECT_TRUE(listener_incognito5.WaitUntilSatisfied()); // Incognito listening | |
| 204 listener4.Reply("ok"); | |
| 205 listener_incognito4.Reply("ok"); | |
| 206 // Regular preference set - notify the incognito listener | |
| 207 EXPECT_TRUE(listener5.WaitUntilSatisfied()); | |
| 208 listener_incognito5.Reply("done"); | |
|
Bernhard Bauer
2012/06/26 08:44:29
Why are you replying with "done" here instead of "
mitchellwrosen
2012/06/26 17:32:52
Ehh, the words don't actually mean anything, since
Bernhard Bauer
2012/06/26 20:09:55
Would you mind still changing it to "ok" (or chang
| |
| 209 | |
| 210 // Test 4 - changeIncognitoOnlyBack | |
| 211 EXPECT_TRUE(listener6.WaitUntilSatisfied()); // Regular ready | |
| 212 EXPECT_TRUE(listener_incognito6.WaitUntilSatisfied()); // Incognito ready | |
| 213 EXPECT_TRUE(listener7.WaitUntilSatisfied()); // Regular listening | |
| 214 listener6.Reply("ok"); | |
| 215 listener_incognito6.Reply("ok"); | |
| 216 // Incognito preference set -- notify the regular listener | |
| 217 EXPECT_TRUE(listener_incognito7.WaitUntilSatisfied()); | |
| 218 listener7.Reply("ok"); | |
| 219 | |
| 220 // Test 5 - clearIncognito | |
| 221 EXPECT_TRUE(listener8.WaitUntilSatisfied()); // Regular ready | |
| 222 EXPECT_TRUE(listener_incognito8.WaitUntilSatisfied()); // Incognito ready | |
| 223 EXPECT_TRUE(listener9.WaitUntilSatisfied()); // Regular listening | |
| 224 listener8.Reply("ok"); | |
| 225 listener_incognito8.Reply("ok"); | |
| 226 // Incognito preference cleared -- notify the regular listener | |
| 227 EXPECT_TRUE(listener_incognito9.WaitUntilSatisfied()); | |
| 228 listener9.Reply("ok"); | |
| 229 | |
| 230 // Test 6 - clearDefault | |
| 231 EXPECT_TRUE(listener10.WaitUntilSatisfied()); // Regular ready | |
| 232 EXPECT_TRUE(listener_incognito10.WaitUntilSatisfied()); // Incognito ready | |
| 233 listener10.Reply("ok"); | |
| 234 listener_incognito10.Reply("ok"); | |
| 235 | |
| 236 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | |
| 237 EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message(); | |
| 238 } | |
| OLD | NEW |