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

Side by Side Diff: chrome/browser/content_settings/content_settings_browsertest.cc

Issue 2512563003: Convert enable_plugins to a buildflag header. (Closed)
Patch Set: Merge Created 4 years 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/test/scoped_feature_list.h" 9 #include "base/test/scoped_feature_list.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 338
339 ui_test_utils::NavigateToURL(browser(), test_url); 339 ui_test_utils::NavigateToURL(browser(), test_url);
340 340
341 content::WebContents* web_contents = 341 content::WebContents* web_contents =
342 browser()->tab_strip_model()->GetActiveWebContents(); 342 browser()->tab_strip_model()->GetActiveWebContents();
343 343
344 EXPECT_TRUE(TabSpecificContentSettings::FromWebContents(web_contents)-> 344 EXPECT_TRUE(TabSpecificContentSettings::FromWebContents(web_contents)->
345 IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES)); 345 IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
346 } 346 }
347 347
348 #if defined(ENABLE_PLUGINS) 348 #if BUILDFLAG(ENABLE_PLUGINS)
349 class PepperContentSettingsSpecialCasesTest : public ContentSettingsTest { 349 class PepperContentSettingsSpecialCasesTest : public ContentSettingsTest {
350 protected: 350 protected:
351 void SetUpCommandLine(base::CommandLine* command_line) override { 351 void SetUpCommandLine(base::CommandLine* command_line) override {
352 ASSERT_TRUE(ppapi::RegisterFlashTestPlugin(command_line)); 352 ASSERT_TRUE(ppapi::RegisterFlashTestPlugin(command_line));
353 353
354 #if !defined(DISABLE_NACL) 354 #if !defined(DISABLE_NACL)
355 // Ensure NaCl can run. 355 // Ensure NaCl can run.
356 command_line->AppendSwitch(switches::kEnableNaCl); 356 command_line->AppendSwitch(switches::kEnableNaCl);
357 #endif 357 #endif
358 } 358 }
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 } 540 }
541 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS) && defined(WIDEVINE_CDM_AVAILABLE) 541 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS) && defined(WIDEVINE_CDM_AVAILABLE)
542 542
543 #if !defined(DISABLE_NACL) 543 #if !defined(DISABLE_NACL)
544 IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesJavaScriptBlockedTest, 544 IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesJavaScriptBlockedTest,
545 NaCl) { 545 NaCl) {
546 RunJavaScriptBlockedTest("load_nacl_no_js.html", true); 546 RunJavaScriptBlockedTest("load_nacl_no_js.html", true);
547 } 547 }
548 #endif // !defined(DISABLE_NACL) 548 #endif // !defined(DISABLE_NACL)
549 549
550 #endif // defined(ENABLE_PLUGINS) 550 #endif // BUILDFLAG(ENABLE_PLUGINS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698