chrome/browser/extensions/api/preference/preference_apitest.cc - Issue 19706002: Remove plugin_list.h includes from chrome tests in preparation for moving webkit/plugins to content…

Side by Side Diff: chrome/browser/extensions/api/preference/preference_apitest.cc

Issue 19706002: Remove plugin_list.h includes from chrome tests in preparation for moving webkit/plugins to content… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix posix tests Created 7 years, 5 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/extensions/api/content_settings/content_settings_apitest.cc ('k') | chrome/browser/extensions/extension_service_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/extensions/extension_apitest.h"	7 #include "chrome/browser/extensions/extension_apitest.h"

8 #include "chrome/browser/extensions/extension_test_message_listener.h"	8 #include "chrome/browser/extensions/extension_test_message_listener.h"

9 #include "chrome/browser/profiles/profile.h"	9 #include "chrome/browser/profiles/profile.h"

10 #include "chrome/browser/ui/browser.h"	10 #include "chrome/browser/ui/browser.h"

11 #include "chrome/common/chrome_switches.h"	11 #include "chrome/common/chrome_switches.h"

12 #include "chrome/common/pref_names.h"	12 #include "chrome/common/pref_names.h"

13 #include "chrome/test/base/ui_test_utils.h"	13 #include "chrome/test/base/ui_test_utils.h"

14 #include "webkit/plugins/npapi/mock_plugin_list.h"

15	14

16 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PreferenceApi) {	15 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PreferenceApi) {

17 PrefService* pref_service = browser()->profile()->GetPrefs();	16 PrefService* pref_service = browser()->profile()->GetPrefs();

18 pref_service->SetBoolean(prefs::kAlternateErrorPagesEnabled, false);	17 pref_service->SetBoolean(prefs::kAlternateErrorPagesEnabled, false);

19 pref_service->SetBoolean(autofill::prefs::kAutofillEnabled, false);	18 pref_service->SetBoolean(autofill::prefs::kAutofillEnabled, false);

20 pref_service->SetBoolean(prefs::kBlockThirdPartyCookies, true);	19 pref_service->SetBoolean(prefs::kBlockThirdPartyCookies, true);

21 pref_service->SetBoolean(prefs::kEnableHyperlinkAuditing, false);	20 pref_service->SetBoolean(prefs::kEnableHyperlinkAuditing, false);

22 pref_service->SetBoolean(prefs::kEnableReferrers, false);	21 pref_service->SetBoolean(prefs::kEnableReferrers, false);

23 pref_service->SetBoolean(prefs::kEnableTranslate, false);	22 pref_service->SetBoolean(prefs::kEnableTranslate, false);

24 pref_service->SetBoolean(prefs::kNetworkPredictionEnabled, false);	23 pref_service->SetBoolean(prefs::kNetworkPredictionEnabled, false);

(...skipping 203 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
228	227

229 // Test 6 - clearDefault	228 // Test 6 - clearDefault

230 EXPECT_TRUE(listener10.WaitUntilSatisfied()); // Regular ready	229 EXPECT_TRUE(listener10.WaitUntilSatisfied()); // Regular ready

231 EXPECT_TRUE(listener_incognito10.WaitUntilSatisfied()); // Incognito ready	230 EXPECT_TRUE(listener_incognito10.WaitUntilSatisfied()); // Incognito ready

232 listener10.Reply("ok");	231 listener10.Reply("ok");

233 listener_incognito10.Reply("ok");	232 listener_incognito10.Reply("ok");

234	233

235 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();	234 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();

236 EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message();	235 EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message();

237 }	236 }

OLD	NEW