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

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

Issue 2517953003: Move enable_webrtc to a buildflag header. (Closed)
Patch Set: Fix Created 4 years, 1 month 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
OLDNEW
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 <memory> 5 #include <memory>
6 6
7 #include "base/bind_helpers.h" 7 #include "base/bind_helpers.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 14 matching lines...) Expand all
25 #include "components/content_settings/core/common/pref_names.h" 25 #include "components/content_settings/core/common/pref_names.h"
26 #include "components/password_manager/core/common/password_manager_pref_names.h" 26 #include "components/password_manager/core/common/password_manager_pref_names.h"
27 #include "components/prefs/pref_service.h" 27 #include "components/prefs/pref_service.h"
28 #include "components/translate/core/common/translate_pref_names.h" 28 #include "components/translate/core/common/translate_pref_names.h"
29 #include "content/public/browser/notification_service.h" 29 #include "content/public/browser/notification_service.h"
30 #include "content/public/common/webrtc_ip_handling_policy.h" 30 #include "content/public/common/webrtc_ip_handling_policy.h"
31 #include "extensions/browser/extension_registry.h" 31 #include "extensions/browser/extension_registry.h"
32 #include "extensions/browser/test_extension_registry_observer.h" 32 #include "extensions/browser/test_extension_registry_observer.h"
33 #include "extensions/test/extension_test_message_listener.h" 33 #include "extensions/test/extension_test_message_listener.h"
34 #include "extensions/test/result_catcher.h" 34 #include "extensions/test/result_catcher.h"
35 #include "media/media_features.h"
35 36
36 class ExtensionPreferenceApiTest : public ExtensionApiTest { 37 class ExtensionPreferenceApiTest : public ExtensionApiTest {
37 protected: 38 protected:
38 ExtensionPreferenceApiTest() : profile_(NULL) {} 39 ExtensionPreferenceApiTest() : profile_(NULL) {}
39 40
40 void CheckPreferencesSet() { 41 void CheckPreferencesSet() {
41 PrefService* prefs = profile_->GetPrefs(); 42 PrefService* prefs = profile_->GetPrefs();
42 const PrefService::Preference* pref = prefs->FindPreference( 43 const PrefService::Preference* pref = prefs->FindPreference(
43 prefs::kBlockThirdPartyCookies); 44 prefs::kBlockThirdPartyCookies);
44 ASSERT_TRUE(pref); 45 ASSERT_TRUE(pref);
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 prefs->SetBoolean(prefs::kBlockThirdPartyCookies, true); 120 prefs->SetBoolean(prefs::kBlockThirdPartyCookies, true);
120 prefs->SetBoolean(prefs::kEnableHyperlinkAuditing, false); 121 prefs->SetBoolean(prefs::kEnableHyperlinkAuditing, false);
121 prefs->SetBoolean(prefs::kEnableReferrers, false); 122 prefs->SetBoolean(prefs::kEnableReferrers, false);
122 prefs->SetBoolean(prefs::kEnableTranslate, false); 123 prefs->SetBoolean(prefs::kEnableTranslate, false);
123 prefs->SetInteger(prefs::kNetworkPredictionOptions, 124 prefs->SetInteger(prefs::kNetworkPredictionOptions,
124 chrome_browser_net::NETWORK_PREDICTION_NEVER); 125 chrome_browser_net::NETWORK_PREDICTION_NEVER);
125 prefs->SetBoolean(password_manager::prefs::kPasswordManagerSavingEnabled, 126 prefs->SetBoolean(password_manager::prefs::kPasswordManagerSavingEnabled,
126 false); 127 false);
127 prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false); 128 prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false);
128 prefs->SetBoolean(prefs::kSearchSuggestEnabled, false); 129 prefs->SetBoolean(prefs::kSearchSuggestEnabled, false);
129 #if defined(ENABLE_WEBRTC) 130 #if BUILDFLAG(ENABLE_WEBRTC)
130 prefs->SetBoolean(prefs::kWebRTCMultipleRoutesEnabled, false); 131 prefs->SetBoolean(prefs::kWebRTCMultipleRoutesEnabled, false);
131 prefs->SetBoolean(prefs::kWebRTCNonProxiedUdpEnabled, false); 132 prefs->SetBoolean(prefs::kWebRTCNonProxiedUdpEnabled, false);
132 prefs->SetString(prefs::kWebRTCIPHandlingPolicy, 133 prefs->SetString(prefs::kWebRTCIPHandlingPolicy,
133 content::kWebRTCIPHandlingDefaultPublicInterfaceOnly); 134 content::kWebRTCIPHandlingDefaultPublicInterfaceOnly);
134 #endif 135 #endif
135 136
136 const char kExtensionPath[] = "preference/standard"; 137 const char kExtensionPath[] = "preference/standard";
137 138
138 EXPECT_TRUE(RunExtensionSubtest(kExtensionPath, "test.html")) << message_; 139 EXPECT_TRUE(RunExtensionSubtest(kExtensionPath, "test.html")) << message_;
139 CheckPreferencesSet(); 140 CheckPreferencesSet();
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 listener_incognito10.Reply("ok"); 343 listener_incognito10.Reply("ok");
343 344
344 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); 345 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
345 EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message(); 346 EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message();
346 } 347 }
347 348
348 IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, DataReductionProxy) { 349 IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, DataReductionProxy) {
349 EXPECT_TRUE(RunExtensionTest("preference/data_reduction_proxy")) << 350 EXPECT_TRUE(RunExtensionTest("preference/data_reduction_proxy")) <<
350 message_; 351 message_;
351 } 352 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698