diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index e0b8e12b9c8c0..d6f6af8f3b8ce 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -19,7 +19,7 @@ import("//chrome/process_version_rc_template.gni")
import("//components/nacl/features.gni")
import("//extensions/buildflags/buildflags.gni")
import("//media/media_options.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
import("//third_party/WebKit/public/public_features.gni")
import("//third_party/widevine/cdm/widevine.gni")
import("//tools/resources/generate_resource_whitelist.gni")
@@ -402,7 +402,7 @@ if (is_win) {
"//crypto",
"//headless:headless_shell_browser_lib",
"//net:net_resources",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//services/service_manager/embedder",
"//third_party/cld_3/src/src:cld_3",
"//third_party/wtl",
diff --git a/chrome/DEPS b/chrome/DEPS
index 68fab23bbfd32..b05b1838e9bec 100644
--- a/chrome/DEPS
+++ b/chrome/DEPS
@@ -27,7 +27,7 @@ include_rules = [
"+media/media_buildflags.h",
"+mojo/common",
"+mojo/public",
- "+ppapi/features",
+ "+ppapi/buildflags",
# Don't allow inclusion of these other libs we shouldn't be calling directly.
"-webkit",
diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
index d72312f626bac..d6c5e0d2e81d9 100644
--- a/chrome/app/BUILD.gn
+++ b/chrome/app/BUILD.gn
@@ -6,7 +6,7 @@ import("//build/config/ui.gni")
import("//chrome/common/features.gni")
import("//chromeos/assistant/assistant.gni")
import("//components/nacl/features.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
import("//printing/features/features.gni")
import("//services/catalog/public/tools/catalog.gni")
import("//services/service_manager/public/service_manifest.gni")
@@ -334,7 +334,7 @@ static_library("test_support") {
"//content/public/common",
"//content/public/common:service_names",
"//pdf",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//printing/features",
"//services/service_manager/embedder",
"//ui/base",
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index a148b5954c5b0..2602ba81d23c4 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -58,7 +58,7 @@
#include "content/public/common/service_names.mojom.h"
#include "extensions/common/constants.h"
#include "pdf/buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "printing/features/features.h"
#include "services/service_manager/embedder/switches.h"
#include "ui/base/material_design/material_design_controller.h"
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 0d86c8f8a8cd7..5cb3c591feb66 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -19,7 +19,7 @@ import("//device/vr/buildflags/buildflags.gni")
import("//extensions/buildflags/buildflags.gni")
import("//media/media_options.gni")
import("//net/features.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
import("//printing/features/features.gni")
import("//rlz/features/features.gni")
import("//sandbox/features.gni")
@@ -1770,7 +1770,7 @@ jumbo_split_static_library("browser") {
"//mojo/public/cpp/bindings",
"//net:extras",
"//net:net_browser_services",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//printing/features",
"//rlz/features",
"//services/data_decoder/public/cpp",
@@ -3862,7 +3862,7 @@ jumbo_split_static_library("browser") {
deps += [
"//components/pdf/browser",
"//media:media_buildflags",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//ppapi/proxy:ipc",
"//services/device/public/mojom",
"//third_party/adobe/flash:flapper_version_h",
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 99fb5e49b1d37..c51e39f8ae6f9 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -110,7 +110,7 @@
#include "net/cert/cert_verify_proc_android.h"
#include "net/nqe/effective_connection_type.h"
#include "net/nqe/network_quality_estimator_params.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "printing/features/features.h"
#include "services/device/public/cpp/device_features.h"
#include "services/network/public/cpp/features.h"
diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrome/browser/android/tab_web_contents_delegate_android.cc
index 29dd3d19421bd..acd62999b81c4 100644
--- a/chrome/browser/android/tab_web_contents_delegate_android.cc
+++ b/chrome/browser/android/tab_web_contents_delegate_android.cc
@@ -51,7 +51,7 @@
#include "content/public/common/file_chooser_params.h"
#include "content/public/common/media_stream_request.h"
#include "jni/TabWebContentsDelegateAndroid_jni.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/rect_f.h"
diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc
index 852dfdb0a8e0e..46db2255c40e2 100644
--- a/chrome/browser/apps/guest_view/web_view_browsertest.cc
+++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc
@@ -91,7 +91,7 @@
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "net/test/embedded_test_server/http_request.h"
#include "net/test/embedded_test_server/http_response.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "third_party/WebKit/public/platform/WebMouseEvent.h"
#include "ui/aura/env.h"
#include "ui/aura/window.h"
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 57d435c67b70c..dc32648d8e1ca 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -129,7 +129,7 @@
#include "media/media_buildflags.h"
#include "net/socket/client_socket_pool_manager.h"
#include "net/url_request/url_request_context_getter.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "printing/features/features.h"
#include "services/network/public/cpp/network_switches.h"
#include "services/preferences/public/cpp/in_process_service_factory.h"
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index a345d423cfc01..ba4e914299c1f 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -28,7 +28,7 @@
#include "components/prefs/pref_change_registrar.h"
#include "extensions/buildflags/buildflags.h"
#include "media/media_buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "printing/features/features.h"
#include "services/network/public/mojom/network_service.mojom.h"
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
index 6e6daf85da42a..df857b33ebbd6 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
@@ -24,7 +24,7 @@
#include "content/public/browser/browsing_data_remover_delegate.h"
#include "extensions/buildflags/buildflags.h"
#include "media/media_buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#if BUILDFLAG(ENABLE_PLUGINS)
#include "chrome/browser/pepper_flash_settings_manager.h"
diff --git a/chrome/browser/browsing_data/counters/media_licenses_counter.cc b/chrome/browser/browsing_data/counters/media_licenses_counter.cc
index 7d21a0c743f8c..e0b7c841411ff 100644
--- a/chrome/browser/browsing_data/counters/media_licenses_counter.cc
+++ b/chrome/browser/browsing_data/counters/media_licenses_counter.cc
@@ -11,7 +11,7 @@
#include "build/build_config.h"
#include "chrome/browser/profiles/profile.h"
#include "components/browsing_data/core/pref_names.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#if BUILDFLAG(ENABLE_PLUGINS)
#include "base/memory/ref_counted.h"
diff --git a/chrome/browser/browsing_data/counters/site_data_counting_helper.cc b/chrome/browser/browsing_data/counters/site_data_counting_helper.cc
index 3470aefffbf5f..dc77ed33f430e 100644
--- a/chrome/browser/browsing_data/counters/site_data_counting_helper.cc
+++ b/chrome/browser/browsing_data/counters/site_data_counting_helper.cc
@@ -20,7 +20,7 @@
#include "net/ssl/channel_id_store.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "storage/browser/quota/quota_manager.h"
using content::BrowserThread;
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 87aed9026c5ab..45f438e4ae85a 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -240,7 +240,7 @@
#include "net/cookies/cookie_options.h"
#include "net/ssl/client_cert_store.h"
#include "net/ssl/ssl_cert_request_info.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "ppapi/host/ppapi_host.h"
#include "printing/features/features.h"
#include "services/network/public/cpp/features.h"
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index 61fd92f4fdf86..e03bc6bb4b75f 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -23,7 +23,7 @@
#include "content/public/common/resource_type.h"
#include "extensions/buildflags/buildflags.h"
#include "media/media_buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/network/public/mojom/network_service.mojom.h"
#include "services/service_manager/public/cpp/binder_registry.h"
diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc
index 88059c0370f08..a7f450e672a0f 100644
--- a/chrome/browser/content_settings/content_settings_browsertest.cc
+++ b/chrome/browser/content_settings/content_settings_browsertest.cc
@@ -44,7 +44,7 @@
#include "net/dns/mock_host_resolver.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "net/test/url_request/url_request_mock_http_job.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "ppapi/shared_impl/ppapi_switches.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
index 3ef4ffeb1c930..502c616396f09 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
@@ -37,7 +37,7 @@
#include "components/sync_preferences/pref_service_syncable.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
#include "content/public/test/test_browser_thread_bundle.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
index 57247f32a46a4..469adb1f783b4 100644
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -62,7 +62,7 @@
#include "extensions/buildflags/buildflags.h"
#include "net/base/filename_util.h"
#include "net/base/mime_util.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "ui/base/l10n/l10n_util.h"
#if defined(OS_ANDROID)
diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc
index 167b9f6ca167c..77f2094922032 100644
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -33,7 +33,7 @@
#include "extensions/buildflags/buildflags.h"
#include "extensions/common/constants.h"
#include "net/base/filename_util.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "third_party/WebKit/public/common/mime_util/mime_util.h"
#include "ui/base/l10n/l10n_util.h"
#include "url/origin.h"
diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/browser/download/download_target_determiner.h
index f5ec4c0ddf966..133117c5674a2 100644
--- a/chrome/browser/download/download_target_determiner.h
+++ b/chrome/browser/download/download_target_determiner.h
@@ -21,7 +21,7 @@
#include "components/download/public/common/download_danger_type.h"
#include "components/download/public/common/download_item.h"
#include "content/public/browser/download_manager_delegate.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
class Profile;
class DownloadPrefs;
diff --git a/chrome/browser/download/download_target_determiner_unittest.cc b/chrome/browser/download/download_target_determiner_unittest.cc
index 07895cbe0ec7d..77980091b8ce1 100644
--- a/chrome/browser/download/download_target_determiner_unittest.cc
+++ b/chrome/browser/download/download_target_determiner_unittest.cc
@@ -50,7 +50,7 @@
#include "content/public/test/web_contents_tester.h"
#include "extensions/buildflags/buildflags.h"
#include "net/base/mime_util.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/origin.h"
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index 6ccda19c680c5..4d6fd0b5d4827 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -872,7 +872,7 @@ static_library("extensions") {
"//google_apis",
"//media:media_buildflags",
"//net",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//printing/features",
"//rlz/features",
"//services/audio/public/cpp",
diff --git a/chrome/browser/extensions/browser_context_keyed_service_factories.cc b/chrome/browser/extensions/browser_context_keyed_service_factories.cc
index 449ced913067f..776733e79a303 100644
--- a/chrome/browser/extensions/browser_context_keyed_service_factories.cc
+++ b/chrome/browser/extensions/browser_context_keyed_service_factories.cc
@@ -50,7 +50,7 @@
#include "chrome/common/buildflags.h"
#include "components/spellcheck/spellcheck_buildflags.h"
#include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/extensions/file_manager/event_router_factory.h"
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 9829c085696b7..679f4f5594746 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -39,7 +39,7 @@
#include "extensions/common/extension_l10n_util.h"
#include "extensions/common/file_util.h"
#include "extensions/common/manifest_constants.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "printing/features/features.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc b/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
index 97e67255c1c71..f339248ae4c3a 100644
--- a/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
+++ b/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
@@ -33,7 +33,7 @@
#include "extensions/browser/extension_prefs.h"
#include "extensions/browser/install_flag.h"
#include "extensions/common/manifest_constants.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
namespace {
const char kExtensionId1[] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
diff --git a/chrome/browser/extensions/extension_garbage_collector_unittest.cc b/chrome/browser/extensions/extension_garbage_collector_unittest.cc
index 4294a39c19406..4080df50b665c 100644
--- a/chrome/browser/extensions/extension_garbage_collector_unittest.cc
+++ b/chrome/browser/extensions/extension_garbage_collector_unittest.cc
@@ -21,7 +21,7 @@
#include "content/public/test/test_utils.h"
#include "extensions/browser/extension_prefs.h"
#include "extensions/browser/pref_names.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
namespace extensions {
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index f9d7a3d481983..c466ffebe9de9 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -135,7 +135,7 @@
#include "net/cookies/cookie_store.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/network/public/mojom/cookie_manager.mojom.h"
#include "services/network/public/mojom/network_service.mojom.h"
#include "storage/browser/database/database_tracker.h"
diff --git a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc
index 9e7f8a02fbab1..5d765a4677ec6 100644
--- a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc
+++ b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc
@@ -21,7 +21,7 @@
#include "content/public/browser/render_view_host.h"
#include "extensions/browser/guest_view/web_view/web_view_constants.h"
#include "extensions/browser/guest_view/web_view/web_view_guest.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
namespace extensions {
diff --git a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.h b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.h
index 31e6fdaf85b6e..5e538fc209ad1 100644
--- a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.h
+++ b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.h
@@ -12,7 +12,7 @@
#include "content/public/browser/web_contents_binding_set.h"
#include "extensions/browser/guest_view/web_view/web_view_permission_helper.h"
#include "extensions/browser/guest_view/web_view/web_view_permission_helper_delegate.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
namespace extensions {
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
index 1866155ce8277..9942ca8544583 100644
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -89,7 +89,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/histogram_fetcher.h"
#include "content/public/browser/notification_service.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "printing/features/features.h"
#if defined(OS_ANDROID)
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.h b/chrome/browser/metrics/chrome_metrics_service_client.h
index 517966db6e7df..2fcd053eb6a4b 100644
--- a/chrome/browser/metrics/chrome_metrics_service_client.h
+++ b/chrome/browser/metrics/chrome_metrics_service_client.h
@@ -27,7 +27,7 @@
#include "components/ukm/observers/sync_disable_observer.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "third_party/metrics_proto/system_profile.pb.h"
class PluginMetricsProvider;
diff --git a/chrome/browser/metrics/chrome_stability_metrics_provider.cc b/chrome/browser/metrics/chrome_stability_metrics_provider.cc
index 20a853bb015c8..1c3da119a92ad 100644
--- a/chrome/browser/metrics/chrome_stability_metrics_provider.cc
+++ b/chrome/browser/metrics/chrome_stability_metrics_provider.cc
@@ -17,7 +17,7 @@
#include "content/public/browser/notification_service.h"
#include "content/public/browser/render_process_host.h"
#include "extensions/buildflags/buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "extensions/browser/process_map.h"
diff --git a/chrome/browser/metrics/metrics_memory_details.cc b/chrome/browser/metrics/metrics_memory_details.cc
index b57bedf4e9979..0625f763d7ed3 100644
--- a/chrome/browser/metrics/metrics_memory_details.cc
+++ b/chrome/browser/metrics/metrics_memory_details.cc
@@ -18,7 +18,7 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/common/content_constants.h"
#include "content/public/common/process_type.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "third_party/leveldatabase/leveldb_chrome.h"
MetricsMemoryDetails::MetricsMemoryDetails(
diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
index 06dbeca43808d..9349cc35f9ec8 100644
--- a/chrome/browser/permissions/permission_manager.cc
+++ b/chrome/browser/permissions/permission_manager.cc
@@ -42,7 +42,7 @@
#include "content/public/browser/web_contents.h"
#include "device/vr/buildflags/buildflags.h"
#include "extensions/common/constants.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#if BUILDFLAG(ENABLE_PLUGINS)
#include "chrome/browser/plugins/flash_permission_context.h"
diff --git a/chrome/browser/plugins/pdf_iframe_navigation_throttle.cc b/chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
index 3b0948c90a009..d05027d091651 100644
--- a/chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
+++ b/chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
@@ -15,7 +15,7 @@
#include "content/public/browser/web_contents.h"
#include "net/base/escape.h"
#include "net/http/http_response_headers.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#if BUILDFLAG(ENABLE_PLUGINS)
#include "chrome/browser/plugins/chrome_plugin_service_filter.h"
diff --git a/chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc b/chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc
index 162fef6023a41..21c0ff360c4a2 100644
--- a/chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc
+++ b/chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc
@@ -11,7 +11,7 @@
#include "chrome/test/base/testing_profile.h"
#include "content/public/browser/navigation_handle.h"
#include "net/http/http_util.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#if BUILDFLAG(ENABLE_PLUGINS)
#include "chrome/browser/plugins/chrome_plugin_service_filter.h"
diff --git a/chrome/browser/plugins/pdf_plugin_placeholder_observer.cc b/chrome/browser/plugins/pdf_plugin_placeholder_observer.cc
index 66e57f6cde8cd..5226b4127e218 100644
--- a/chrome/browser/plugins/pdf_plugin_placeholder_observer.cc
+++ b/chrome/browser/plugins/pdf_plugin_placeholder_observer.cc
@@ -18,7 +18,7 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/storage_partition.h"
#include "net/traffic_annotation/network_traffic_annotation.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
namespace {
diff --git a/chrome/browser/plugins/plugin_info_host_impl.cc b/chrome/browser/plugins/plugin_info_host_impl.cc
index b884b5776aef8..ddf0704f80fce 100644
--- a/chrome/browser/plugins/plugin_info_host_impl.cc
+++ b/chrome/browser/plugins/plugin_info_host_impl.cc
@@ -48,7 +48,7 @@
#include "content/public/common/content_constants.h"
#include "extensions/buildflags/buildflags.h"
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/metrics/public/cpp/ukm_builders.h"
#include "services/metrics/public/cpp/ukm_recorder.h"
#include "url/gurl.h"
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
index 9cfb8fbc27302..e11b6d3e224cf 100644
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -61,7 +61,7 @@
#include "components/variations/pref_names.h"
#include "extensions/buildflags/buildflags.h"
#include "media/media_buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#if defined(OS_ANDROID)
#include "chrome/browser/search/contextual_search_policy_handler_android.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 3bc58b8e96ecd..be1e301e676b4 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -111,7 +111,7 @@
#include "content/public/browser/render_process_host.h"
#include "extensions/buildflags/buildflags.h"
#include "net/http/http_server_properties_manager.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "printing/features/features.h"
#include "rlz/features/features.h"
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
index 2b85d0015d887..0a42d758cf11c 100644
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -85,7 +85,7 @@
#include "components/policy/content/policy_blacklist_navigation_throttle.h"
#include "components/spellcheck/spellcheck_buildflags.h"
#include "extensions/buildflags/buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "printing/features/features.h"
#if defined(OS_ANDROID)
diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc
index 1a0bd22008eb6..7b8fec38213ac 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -61,7 +61,7 @@
#include "extensions/buildflags/buildflags.h"
#include "net/http/http_server_properties.h"
#include "net/http/transport_security_state.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/preferences/public/cpp/in_process_service_factory.h"
#include "services/preferences/public/cpp/pref_service_main.h"
#include "services/preferences/public/mojom/preferences.mojom.h"
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index d1f6b05f2ecdb..0092b13df8acc 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -123,7 +123,7 @@
#include "content/public/common/content_constants.h"
#include "extensions/buildflags/buildflags.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "printing/features/features.h"
#include "services/identity/identity_service.h"
#include "services/identity/public/mojom/constants.mojom.h"
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index 3ed2295dbb2a1..43283b0112401 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -36,7 +36,7 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_interceptor.h"
#include "net/url_request/url_request_job_factory.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/network/public/mojom/network_service.mojom.h"
#include "services/network/url_request_context_owner.h"
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
index 81879e0734fdd..fb8cf0201c206 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -119,7 +119,7 @@
#include "media/base/media_switches.h"
#include "net/base/escape.h"
#include "net/traffic_annotation/network_traffic_annotation.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "printing/features/features.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/WebKit/public/common/associated_interfaces/associated_interface_provider.h"
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h
index e19a002ab81e9..d17832f8a49d5 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -21,7 +21,7 @@
#include "components/renderer_context_menu/render_view_context_menu_proxy.h"
#include "content/public/common/context_menu_params.h"
#include "extensions/buildflags/buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "printing/features/features.h"
#include "ui/base/models/simple_menu_model.h"
#include "ui/base/window_open_disposition.h"
diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc
index 4f819e0cf52d8..4fc4b1b653efc 100644
--- a/chrome/browser/renderer_host/chrome_render_message_filter.cc
+++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc
@@ -31,7 +31,7 @@
#include "content/public/browser/notification_service.h"
#include "content/public/browser/render_process_host.h"
#include "extensions/buildflags/buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "extensions/browser/guest_view/web_view/web_view_permission_helper.h"
diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.h b/chrome/browser/renderer_host/chrome_render_message_filter.h
index f3c20c6a715c2..3652b541f9ba4 100644
--- a/chrome/browser/renderer_host/chrome_render_message_filter.h
+++ b/chrome/browser/renderer_host/chrome_render_message_filter.h
@@ -14,7 +14,7 @@
#include "content/public/browser/browser_message_filter.h"
#include "content/public/browser/browser_thread.h"
#include "extensions/buildflags/buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
class GURL;
class Profile;
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index e52a359c7b627..6a30ba088480a 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -13,7 +13,7 @@ import("//components/offline_pages/buildflags/features.gni")
import("//components/signin/features.gni")
import("//extensions/buildflags/buildflags.gni")
import("//media/media_options.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
import("//printing/features/features.gni")
import("//rlz/features/features.gni")
import("//ui/base/ui_features.gni")
@@ -1053,7 +1053,7 @@ split_static_library("ui") {
"//extensions/buildflags",
"//media",
"//net:net",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//printing/features",
"//rlz/features",
"//services/metrics/public/cpp:ukm_builders",
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
index 7443df0858136..9fd9436a05c92 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
@@ -61,7 +61,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_delegate.h"
#include "content/public/common/origin_util.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "third_party/WebKit/public/common/associated_interfaces/associated_interface_provider.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/material_design/material_design_controller.h"
diff --git a/chrome/browser/ui/page_info/page_info_ui.cc b/chrome/browser/ui/page_info/page_info_ui.cc
index 5322e5f59fd42..a0b6253907201 100644
--- a/chrome/browser/ui/page_info/page_info_ui.cc
+++ b/chrome/browser/ui/page_info/page_info_ui.cc
@@ -20,7 +20,7 @@
#include "chrome/grit/generated_resources.h"
#include "components/strings/grit/components_chromium_strings.h"
#include "components/strings/grit/components_strings.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/material_design/material_design_controller.h"
#include "url/gurl.h"
diff --git a/chrome/browser/ui/page_info/page_info_unittest.cc b/chrome/browser/ui/page_info/page_info_unittest.cc
index ef83f4605bc7c..0edf29b3fb178 100644
--- a/chrome/browser/ui/page_info/page_info_unittest.cc
+++ b/chrome/browser/ui/page_info/page_info_unittest.cc
@@ -42,7 +42,7 @@
#include "net/test/cert_test_util.h"
#include "net/test/test_certificate_data.h"
#include "net/test/test_data_directory.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ui/page_info/permission_menu_model.cc b/chrome/browser/ui/page_info/permission_menu_model.cc
index d990ae84b2499..49f09cc848e75 100644
--- a/chrome/browser/ui/page_info/permission_menu_model.cc
+++ b/chrome/browser/ui/page_info/permission_menu_model.cc
@@ -10,7 +10,7 @@
#include "chrome/common/chrome_features.h"
#include "components/strings/grit/components_strings.h"
#include "content/public/common/origin_util.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/material_design/material_design_controller.h"
diff --git a/chrome/browser/ui/views/page_info/page_info_bubble_view_unittest.cc b/chrome/browser/ui/views/page_info/page_info_bubble_view_unittest.cc
index 289dfa10d4eb4..cf68e43242c9f 100644
--- a/chrome/browser/ui/views/page_info/page_info_bubble_view_unittest.cc
+++ b/chrome/browser/ui/views/page_info/page_info_bubble_view_unittest.cc
@@ -24,7 +24,7 @@
#include "device/base/mock_device_client.h"
#include "device/usb/mock_usb_device.h"
#include "device/usb/mock_usb_service.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/material_design/material_design_controller.h"
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 85f8559006f3a..aa06894429383 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -90,7 +90,7 @@
#include "content/public/common/url_utils.h"
#include "extensions/buildflags/buildflags.h"
#include "media/media_buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "printing/features/features.h"
#include "ui/gfx/favicon_size.h"
#include "ui/web_dialogs/web_dialog_ui.h"
diff --git a/chrome/browser/ui/webui/settings/site_settings_handler.h b/chrome/browser/ui/webui/settings/site_settings_handler.h
index 01be8c4849d92..6df9ee06d9a02 100644
--- a/chrome/browser/ui/webui/settings/site_settings_handler.h
+++ b/chrome/browser/ui/webui/settings/site_settings_handler.h
@@ -16,7 +16,7 @@
#include "content/public/browser/host_zoom_map.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "third_party/WebKit/public/mojom/quota/quota_types.mojom.h"
class HostContentSettingsMap;
diff --git a/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc b/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
index 7e40e5e5081a0..6efafe49981d5 100644
--- a/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
+++ b/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
@@ -31,7 +31,7 @@
#include "content/public/test/test_web_ui.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/common/extension_builder.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "testing/gtest/include/gtest/gtest.h"
#if defined(OS_CHROMEOS)
diff --git a/chrome/browser/ui/webui/version_handler.cc b/chrome/browser/ui/webui/version_handler.cc
index 27c69bbd09f72..90a780dc97adf 100644
--- a/chrome/browser/ui/webui/version_handler.cc
+++ b/chrome/browser/ui/webui/version_handler.cc
@@ -26,7 +26,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h"
#include "content/public/common/content_constants.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "ui/base/l10n/l10n_util.h"
#include "url/gurl.h"
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index 3476fa7c12629..fdbc962b37e1b 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -12,7 +12,7 @@ import("//extensions/buildflags/buildflags.gni")
import("//media/media_options.gni")
import("//mojo/public/tools/bindings/mojom.gni")
import("//pdf/features.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
import("//tools/grit/grit_rule.gni")
if (enable_pdf) {
@@ -265,7 +265,7 @@ static_library("common") {
"//mojo/edk",
"//mojo/public/cpp/bindings",
"//pdf:buildflags",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//printing/features",
"//services/service_manager/sandbox",
"//skia",
@@ -527,7 +527,7 @@ static_library("non_code_constants") {
":buildflags",
":version_header",
"//base",
- "//ppapi/features",
+ "//ppapi/buildflags",
]
public_deps = [
@@ -574,7 +574,7 @@ static_library("constants") {
"//device/vr/buildflags",
"//media:media_buildflags",
"//media/cdm:cdm_paths", # Needed by chrome_paths.cc.
- "//ppapi/features",
+ "//ppapi/buildflags",
"//third_party/widevine/cdm:headers",
]
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 7270cb95d265a..d5bf48a765e82 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -53,7 +53,7 @@
#include "media/media_buildflags.h"
#include "net/http/http_util.h"
#include "pdf/buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/common/chrome_content_client.h b/chrome/common/chrome_content_client.h
index bb74e131b3dd2..f279016791655 100644
--- a/chrome/common/chrome_content_client.h
+++ b/chrome/common/chrome_content_client.h
@@ -18,7 +18,7 @@
#include "chrome/common/origin_trials/chrome_origin_trial_policy.h"
#include "components/nacl/common/buildflags.h"
#include "content/public/common/content_client.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#if BUILDFLAG(ENABLE_PLUGINS)
#include "content/public/common/pepper_plugin_info.h"
diff --git a/chrome/common/chrome_content_client_unittest.cc b/chrome/common/chrome_content_client_unittest.cc
index 3bc13bd69a342..51bacdb2c4bcb 100644
--- a/chrome/common/chrome_content_client_unittest.cc
+++ b/chrome/common/chrome_content_client_unittest.cc
@@ -15,7 +15,7 @@
#include "content/public/common/content_switches.h"
#include "content/public/common/origin_util.h"
#include "extensions/common/constants.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
#include "url/origin.h"
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
index 2b28a7c369e71..a879d91058f8e 100644
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -8,7 +8,7 @@
#include "build/build_config.h"
#include "chrome/common/chrome_switches.h"
#include "extensions/buildflags/buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
namespace features {
diff --git a/chrome/common/chrome_features.h b/chrome/common/chrome_features.h
index 47bc134eca3ac..376e8c64efd6b 100644
--- a/chrome/common/chrome_features.h
+++ b/chrome/common/chrome_features.h
@@ -14,7 +14,7 @@
#include "chrome/common/buildflags.h"
#include "device/vr/buildflags/buildflags.h"
#include "extensions/buildflags/buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "printing/features/features.h"
#include "ui/base/ui_features.h"
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index dc9f83617064d..7308c1af2450d 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -5,7 +5,7 @@
#include "chrome/common/chrome_switches.h"
#include "build/build_config.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "printing/features/features.h"
namespace switches {
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 5705844a3f9d4..df649d5334b80 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -10,7 +10,7 @@
#include "build/build_config.h"
#include "chrome/common/buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "printing/features/features.h"
#include "ui/base/ui_features.h"
diff --git a/chrome/common/features.gni b/chrome/common/features.gni
index 04970c1d0447d..bfdee74e8eacf 100644
--- a/chrome/common/features.gni
+++ b/chrome/common/features.gni
@@ -11,7 +11,7 @@ import("//device/vr/buildflags/buildflags.gni")
import("//extensions/buildflags/buildflags.gni")
import("//media/media_options.gni")
import("//net/features.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
import("//printing/features/features.gni")
import("//ui/base/ui_features.gni")
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index d028bc961e47f..3d8f4a3f4afef 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -10,7 +10,7 @@
#include "chrome/common/pref_font_webkit_names.h"
#include "extensions/buildflags/buildflags.h"
#include "media/media_buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
namespace prefs {
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index bcea9726e444e..a34a42b653dac 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -14,7 +14,7 @@
#include "components/offline_pages/buildflags/buildflags.h"
#include "extensions/buildflags/buildflags.h"
#include "media/media_buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "rlz/features/features.h"
namespace prefs {
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 9f98f548a7be9..3c61f8f0192fc 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -25,7 +25,7 @@
#include "ipc/ipc_message_macros.h"
#include "ipc/ipc_platform_file.h"
#include "media/media_buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "url/gurl.h"
#include "url/ipc/url_param_traits.h"
#include "url/origin.h"
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 3d0e44a42a057..eba22426385dd 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -20,7 +20,7 @@
#include "chrome/common/buildflags.h"
#include "chrome/common/webui_url_constants.h"
#include "content/public/common/url_constants.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
namespace chrome {
diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
index 86014333bcbee..ac2676bf9a63a 100644
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -8,7 +8,7 @@ import("//components/nacl/features.gni")
import("//components/spellcheck/spellcheck_build_features.gni")
import("//extensions/buildflags/buildflags.gni")
import("//media/media_options.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
import("//tools/grit/grit_rule.gni")
grit("resources") {
@@ -146,7 +146,7 @@ static_library("renderer") {
"//media/capture",
"//mojo/public/cpp/bindings",
"//net",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//printing/features",
"//services/metrics/public/cpp:metrics_cpp",
"//services/metrics/public/mojom",
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 19d6e8822a4be..5c705c5acb36d 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -105,8 +105,8 @@
#include "media/base/media_switches.h"
#include "media/media_buildflags.h"
#include "net/base/net_errors.h"
+#include "ppapi/buildflags/buildflags.h"
#include "ppapi/c/private/ppb_pdf.h"
-#include "ppapi/features/features.h"
#include "ppapi/shared_impl/ppapi_switches.h"
#include "printing/features/features.h"
#include "services/service_manager/public/cpp/connector.h"
diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
index 95bd1ea1ea19a..9aab65ef3918c 100644
--- a/chrome/renderer/chrome_content_renderer_client.h
+++ b/chrome/renderer/chrome_content_renderer_client.h
@@ -27,7 +27,7 @@
#include "extensions/buildflags/buildflags.h"
#include "ipc/ipc_channel_proxy.h"
#include "media/media_buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "printing/features/features.h"
#include "services/service_manager/public/cpp/binder_registry.h"
#include "services/service_manager/public/cpp/connector.h"
diff --git a/chrome/renderer/pepper/pepper_uma_host.cc b/chrome/renderer/pepper/pepper_uma_host.cc
index 58df727697cd8..8876ceaf9b711 100644
--- a/chrome/renderer/pepper/pepper_uma_host.cc
+++ b/chrome/renderer/pepper/pepper_uma_host.cc
@@ -20,8 +20,8 @@
#include "content/public/renderer/renderer_ppapi_host.h"
#include "extensions/buildflags/buildflags.h"
#include "media/media_buildflags.h"
+#include "ppapi/buildflags/buildflags.h"
#include "ppapi/c/pp_errors.h"
-#include "ppapi/features/features.h"
#include "ppapi/host/dispatch_host_message.h"
#include "ppapi/host/host_message_context.h"
#include "ppapi/host/ppapi_host.h"
diff --git a/chrome/renderer/plugins/plugin_uma_unittest.cc b/chrome/renderer/plugins/plugin_uma_unittest.cc
index 35410ca2bf89b..33882b5cd0f9f 100644
--- a/chrome/renderer/plugins/plugin_uma_unittest.cc
+++ b/chrome/renderer/plugins/plugin_uma_unittest.cc
@@ -6,7 +6,7 @@
#include "chrome/renderer/plugins/plugin_uma.h"
#include "media/media_buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
class PluginUMATest : public testing::Test {
public:
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index e438975867904..8d6b80a5a2668 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -18,7 +18,7 @@ import("//components/spellcheck/spellcheck_build_features.gni")
import("//extensions/buildflags/buildflags.gni")
import("//media/media_options.gni")
import("//mojo/public/tools/bindings/mojom.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
import("//remoting/remoting_enable.gni")
import("//rlz/features/features.gni")
import("//services/service_manager/public/service_manifest.gni")
@@ -160,7 +160,7 @@ static_library("test_support") {
"//net",
"//net:test_support",
"//pdf",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//printing/features",
"//skia",
"//sql",
@@ -364,7 +364,7 @@ test("browser_tests") {
"//extensions/buildflags",
"//media:media_buildflags",
"//net:test_support",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//printing/features",
"//rlz/features",
"//third_party/WebKit/public:features",
@@ -2753,7 +2753,7 @@ test("unit_tests") {
"//mojo/public/cpp/bindings",
"//net",
"//net:test_support",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//services/data_decoder/public/cpp:test_support",
"//services/network/public/cpp",
"//skia",
diff --git a/chrome/test/base/test_switches.cc b/chrome/test/base/test_switches.cc
index 03e98b48e2750..14c5975af8294 100644
--- a/chrome/test/base/test_switches.cc
+++ b/chrome/test/base/test_switches.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "build/build_config.h"
#include "chrome/test/base/test_switches.h"
-#include "ppapi/features/features.h"
+#include "build/build_config.h"
+#include "ppapi/buildflags/buildflags.h"
namespace switches {
diff --git a/chrome/test/base/test_switches.h b/chrome/test/base/test_switches.h
index 5a0945a63424c..f9fbf7455fd34 100644
--- a/chrome/test/base/test_switches.h
+++ b/chrome/test/base/test_switches.h
@@ -6,7 +6,7 @@
#define CHROME_TEST_BASE_TEST_SWITCHES_H_
#include "build/build_config.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
namespace switches {
diff --git a/components/autofill/DEPS b/components/autofill/DEPS
index 15a0bfa704463..b6a154517d2e7 100644
--- a/components/autofill/DEPS
+++ b/components/autofill/DEPS
@@ -13,5 +13,5 @@ include_rules = [
"-components/autofill/content",
# This directory contains build flags and does not pull all of PPAPI in.
- "+ppapi/features",
+ "+ppapi/buildflags",
]
diff --git a/components/autofill/content/browser/BUILD.gn b/components/autofill/content/browser/BUILD.gn
index 3e13b84725163..20852d3cd3d90 100644
--- a/components/autofill/content/browser/BUILD.gn
+++ b/components/autofill/content/browser/BUILD.gn
@@ -38,7 +38,7 @@ static_library("browser") {
"//mojo/common:common_base",
"//mojo/public/cpp/bindings",
"//net",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//services/device/public/mojom",
"//services/service_manager/public/cpp",
"//sql",
diff --git a/components/autofill/content/browser/risk/fingerprint.cc b/components/autofill/content/browser/risk/fingerprint.cc
index 8a9125ba166f6..c48c4eba9d284 100644
--- a/components/autofill/content/browser/risk/fingerprint.cc
+++ b/components/autofill/content/browser/risk/fingerprint.cc
@@ -41,7 +41,7 @@
#include "device/geolocation/public/cpp/geoposition.h"
#include "gpu/config/gpu_info.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/device/public/mojom/constants.mojom.h"
#include "services/device/public/mojom/geolocation.mojom.h"
#include "services/device/public/mojom/geolocation_context.mojom.h"
diff --git a/components/cdm/DEPS b/components/cdm/DEPS
index 7af364748c1b5..c666475c35788 100644
--- a/components/cdm/DEPS
+++ b/components/cdm/DEPS
@@ -3,5 +3,5 @@ include_rules = [
"+media/base",
"+media/cdm",
"+media/media_buildflags.h",
- "+ppapi/features",
+ "+ppapi/buildflags",
]
diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn
index b764d00f0951d..47f3584df29d6 100644
--- a/components/content_settings/core/browser/BUILD.gn
+++ b/components/content_settings/core/browser/BUILD.gn
@@ -3,7 +3,7 @@
# found in the LICENSE file.
import("//build/config/features.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
static_library("browser") {
sources = [
diff --git a/components/plugins/renderer/BUILD.gn b/components/plugins/renderer/BUILD.gn
index 8da45b620a980..066a3d6b7caab 100644
--- a/components/plugins/renderer/BUILD.gn
+++ b/components/plugins/renderer/BUILD.gn
@@ -3,7 +3,7 @@
# found in the LICENSE file.
import("//build/config/features.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
static_library("renderer") {
sources = [
diff --git a/components/renderer_context_menu/BUILD.gn b/components/renderer_context_menu/BUILD.gn
index 7f98c556fa5e9..367a58bdbd879 100644
--- a/components/renderer_context_menu/BUILD.gn
+++ b/components/renderer_context_menu/BUILD.gn
@@ -22,7 +22,7 @@ static_library("renderer_context_menu") {
"//components/search_engines",
"//content/public/browser",
"//content/public/common",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//printing/features",
"//third_party/WebKit/public:blink_headers",
"//ui/base",
diff --git a/components/renderer_context_menu/DEPS b/components/renderer_context_menu/DEPS
index a8b1208bda86a..bf929411529a8 100644
--- a/components/renderer_context_menu/DEPS
+++ b/components/renderer_context_menu/DEPS
@@ -6,6 +6,6 @@ include_rules = [
"+ui/gfx",
"+ui/views",
# This directory contains build flags and does not pull all of PPAPI in.
- "+ppapi/features",
+ "+ppapi/buildflags",
"+third_party/WebKit/public/web",
]
diff --git a/components/renderer_context_menu/render_view_context_menu_base.cc b/components/renderer_context_menu/render_view_context_menu_base.cc
index 562de5bb338be..d9fe1ad694312 100644
--- a/components/renderer_context_menu/render_view_context_menu_base.cc
+++ b/components/renderer_context_menu/render_view_context_menu_base.cc
@@ -16,7 +16,7 @@
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/menu_item.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "third_party/WebKit/public/web/WebContextMenuData.h"
using blink::WebContextMenuData;
diff --git a/components/renderer_context_menu/render_view_context_menu_base.h b/components/renderer_context_menu/render_view_context_menu_base.h
index 849b29c3a0562..83ef6e6797ae5 100644
--- a/components/renderer_context_menu/render_view_context_menu_base.h
+++ b/components/renderer_context_menu/render_view_context_menu_base.h
@@ -20,7 +20,7 @@
#include "components/renderer_context_menu/render_view_context_menu_observer.h"
#include "components/renderer_context_menu/render_view_context_menu_proxy.h"
#include "content/public/common/context_menu_params.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "ui/base/models/simple_menu_model.h"
#include "ui/base/page_transition_types.h"
#include "ui/base/window_open_disposition.h"
diff --git a/components/strings/BUILD.gn b/components/strings/BUILD.gn
index 1f0b61fc4b9dc..54fd83137100c 100644
--- a/components/strings/BUILD.gn
+++ b/components/strings/BUILD.gn
@@ -3,7 +3,7 @@
# found in the LICENSE file.
import("//build/config/locales.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
import("//printing/features/features.gni")
import("//tools/grit/grit_rule.gni")
diff --git a/content/BUILD.gn b/content/BUILD.gn
index 62be6fcc55131..e487443647459 100644
--- a/content/BUILD.gn
+++ b/content/BUILD.gn
@@ -4,7 +4,7 @@
import("//tools/grit/grit_rule.gni")
import("//build/config/nacl/config.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
# Applied by targets internal to content.
config("content_implementation") {
diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn
index 9a4425d1ed8a5..8d8f2826384a3 100644
--- a/content/app/BUILD.gn
+++ b/content/app/BUILD.gn
@@ -4,7 +4,7 @@
import("//build/config/chrome_build.gni")
import("//build/config/features.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
# Implements "content_main" given the defines and visibility. On Windows this
# is compiled with a different define for browser and child, but all code needs
@@ -33,7 +33,7 @@ template("implement_content_app") {
"//services/service_manager/public/mojom",
"//services/service_manager/runner/common",
"//mojo/edk",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//ui/base",
"//ui/gfx",
"//ui/gfx/geometry",
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 65d091baacdb5..a6b08d73c5a60 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -56,7 +56,7 @@
#include "gin/v8_initializer.h"
#include "media/base/media.h"
#include "media/media_buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/service_manager/embedder/switches.h"
#include "services/service_manager/sandbox/sandbox_type.h"
#include "ui/base/ui_base_paths.h"
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 35f189baf47dd..6cbca2902076d 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -11,7 +11,7 @@ import("//content/public/common/zygote_features.gni")
import("//gpu/vulkan/features.gni")
import("//media/media_options.gni")
import("//net/features.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
import("//printing/features/features.gni")
import("//third_party/WebKit/public/public_features.gni")
import("//tools/ipc_fuzzer/ipc_fuzzer.gni")
@@ -115,7 +115,7 @@ jumbo_source_set("browser") {
"//net",
"//net:extras",
"//net:http_server",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//printing/features",
"//services/audio:lib",
"//services/audio/public/cpp",
diff --git a/content/browser/android/browser_startup_controller.cc b/content/browser/android/browser_startup_controller.cc
index 7a8bb0b76df90..67c5bb1167eb6 100644
--- a/content/browser/android/browser_startup_controller.cc
+++ b/content/browser/android/browser_startup_controller.cc
@@ -8,7 +8,7 @@
#include "base/android/jni_string.h"
#include "content/browser/android/content_startup_flags.h"
#include "content/browser/browser_main_loop.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "jni/BrowserStartupController_jni.h"
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index c8c5cfc9b0d76..b6b9322fa53e4 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -122,7 +122,7 @@
#include "net/base/network_change_notifier.h"
#include "net/socket/client_socket_factory.h"
#include "net/ssl/ssl_config_service.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/audio/public/cpp/audio_system_factory.h"
#include "services/resource_coordinator/public/cpp/memory_instrumentation/client_process_impl.h"
#include "services/resource_coordinator/public/mojom/memory_instrumentation/memory_instrumentation.mojom.h"
diff --git a/content/browser/browsing_data/browsing_data_remover_impl.cc b/content/browser/browsing_data/browsing_data_remover_impl.cc
index 7d05714df9f62..ada60bcaa31f1 100644
--- a/content/browser/browsing_data/browsing_data_remover_impl.cc
+++ b/content/browser/browsing_data/browsing_data_remover_impl.cc
@@ -36,7 +36,7 @@
#include "net/ssl/channel_id_store.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/network/public/cpp/features.h"
#include "storage/browser/quota/special_storage_policy.h"
#include "url/origin.h"
diff --git a/content/browser/browsing_data/browsing_data_remover_impl_unittest.cc b/content/browser/browsing_data/browsing_data_remover_impl_unittest.cc
index 1d04bb43c7ddd..cf4705ac2e8d1 100644
--- a/content/browser/browsing_data/browsing_data_remover_impl_unittest.cc
+++ b/content/browser/browsing_data/browsing_data_remover_impl_unittest.cc
@@ -51,7 +51,7 @@
#include "net/ssl/ssl_client_cert_type.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "storage/browser/test/mock_special_storage_policy.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/download/download_browsertest.cc b/content/browser/download/download_browsertest.cc
index c6747731947c8..e76476867b82e 100644
--- a/content/browser/download/download_browsertest.cc
+++ b/content/browser/download/download_browsertest.cc
@@ -66,7 +66,7 @@
#include "net/test/embedded_test_server/http_request.h"
#include "net/test/embedded_test_server/http_response.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
diff --git a/content/browser/frame_host/data_url_navigation_browsertest.cc b/content/browser/frame_host/data_url_navigation_browsertest.cc
index 87c9b51c7a787..02d8c98320239 100644
--- a/content/browser/frame_host/data_url_navigation_browsertest.cc
+++ b/content/browser/frame_host/data_url_navigation_browsertest.cc
@@ -31,7 +31,7 @@
#include "net/base/escape.h"
#include "net/dns/mock_host_resolver.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#if BUILDFLAG(ENABLE_PLUGINS)
#include "content/public/browser/plugin_service.h"
diff --git a/content/browser/frame_host/debug_urls.cc b/content/browser/frame_host/debug_urls.cc
index 46954327b9c7c..2145d655fad64 100644
--- a/content/browser/frame_host/debug_urls.cc
+++ b/content/browser/frame_host/debug_urls.cc
@@ -21,7 +21,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/common/content_constants.h"
#include "content/public/common/url_constants.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "url/gurl.h"
#if BUILDFLAG(ENABLE_PLUGINS)
diff --git a/content/browser/frame_host/render_frame_message_filter.cc b/content/browser/frame_host/render_frame_message_filter.cc
index 2c26059263392..ed30ba5fd39b2 100644
--- a/content/browser/frame_host/render_frame_message_filter.cc
+++ b/content/browser/frame_host/render_frame_message_filter.cc
@@ -42,7 +42,7 @@
#include "net/traffic_annotation/network_traffic_annotation.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/network/public/cpp/features.h"
#include "services/service_manager/public/mojom/interface_provider.mojom.h"
#include "storage/browser/blob/blob_storage_context.h"
diff --git a/content/browser/frame_host/render_frame_message_filter.h b/content/browser/frame_host/render_frame_message_filter.h
index d8b0d1db2acc6..7b06c756df563 100644
--- a/content/browser/frame_host/render_frame_message_filter.h
+++ b/content/browser/frame_host/render_frame_message_filter.h
@@ -16,7 +16,7 @@
#include "content/public/browser/browser_message_filter.h"
#include "content/public/common/three_d_api_types.h"
#include "net/cookies/canonical_cookie.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/network/public/mojom/network_service.mojom.h"
#include "third_party/WebKit/public/web/WebTreeScopeType.h"
#include "url/origin.h"
diff --git a/content/browser/loader/mime_sniffing_resource_handler.cc b/content/browser/loader/mime_sniffing_resource_handler.cc
index a9322bc8b5d77..48fa6bc17a27c 100644
--- a/content/browser/loader/mime_sniffing_resource_handler.cc
+++ b/content/browser/loader/mime_sniffing_resource_handler.cc
@@ -37,7 +37,7 @@
#include "net/http/http_content_disposition.h"
#include "net/http/http_response_headers.h"
#include "net/url_request/url_request.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/network/loader_util.h"
#include "services/network/public/cpp/resource_response.h"
#include "third_party/WebKit/public/common/mime_util/mime_util.h"
diff --git a/content/browser/loader/mime_sniffing_resource_handler.h b/content/browser/loader/mime_sniffing_resource_handler.h
index 807f77e09db87..b1223d34f3d5f 100644
--- a/content/browser/loader/mime_sniffing_resource_handler.h
+++ b/content/browser/loader/mime_sniffing_resource_handler.h
@@ -15,7 +15,7 @@
#include "content/browser/loader/resource_controller.h"
#include "content/common/content_export.h"
#include "content/public/common/request_context_type.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
namespace net {
class URLRequest;
diff --git a/content/browser/loader/mime_sniffing_resource_handler_unittest.cc b/content/browser/loader/mime_sniffing_resource_handler_unittest.cc
index 60db4bac8f8bf..912e62e68deb1 100644
--- a/content/browser/loader/mime_sniffing_resource_handler_unittest.cc
+++ b/content/browser/loader/mime_sniffing_resource_handler_unittest.cc
@@ -31,7 +31,7 @@
#include "content/test/fake_plugin_service.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
#include "net/url_request/url_request_context.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/network/public/cpp/resource_response.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index b89ed271d9881..832f45fc46b33 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -108,7 +108,7 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
#include "net/url_request/url_request_job_factory.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/network/loader_util.h"
#include "services/network/public/cpp/resource_request.h"
#include "services/network/public/cpp/resource_request_body.h"
diff --git a/content/browser/net/accept_header_browsertest.cc b/content/browser/net/accept_header_browsertest.cc
index 8115f83fc14e5..46d76f9f71ddc 100644
--- a/content/browser/net/accept_header_browsertest.cc
+++ b/content/browser/net/accept_header_browsertest.cc
@@ -16,7 +16,7 @@
#include "content/public/test/content_browser_test_utils.h"
#include "content/shell/browser/shell.h"
#include "net/test/embedded_test_server/http_request.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#if BUILDFLAG(ENABLE_PLUGINS)
#include "content/test/ppapi/ppapi_test.h"
diff --git a/content/browser/plugin_private_storage_helper.h b/content/browser/plugin_private_storage_helper.h
index 8b80f6f8ed742..2f92bfa51a43d 100644
--- a/content/browser/plugin_private_storage_helper.h
+++ b/content/browser/plugin_private_storage_helper.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_BROWSER_PLUGIN_PRIVATE_STORAGE_HELPER_H_
#define CONTENT_BROWSER_PLUGIN_PRIVATE_STORAGE_HELPER_H_
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#if !BUILDFLAG(ENABLE_PLUGINS)
#error This file should only be included when plugins are enabled.
diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h
index 08746e3f2de2b..4e11056a3dc9b 100644
--- a/content/browser/plugin_service_impl.h
+++ b/content/browser/plugin_service_impl.h
@@ -8,7 +8,7 @@
#ifndef CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_
#define CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#if !BUILDFLAG(ENABLE_PLUGINS)
#error "Plugins should be enabled"
diff --git a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h
index db48eac07f322..6f00768bc501b 100644
--- a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h
+++ b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h
@@ -24,7 +24,7 @@
#include "content/public/browser/browser_ppapi_host.h"
#include "content/public/common/process_type.h"
#include "ipc/message_filter.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "ppapi/host/ppapi_host.h"
#if !BUILDFLAG(ENABLE_PLUGINS)
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index b9d0fc6770f77..01ed0ee670742 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -190,7 +190,7 @@
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/public/cpp/system/platform_handle.h"
#include "net/url_request/url_request_context_getter.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/device/public/mojom/battery_monitor.mojom.h"
#include "services/device/public/mojom/constants.mojom.h"
#include "services/network/public/cpp/features.h"
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
index dacd1b7286e48..2fe39fa0d57f7 100644
--- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc
@@ -45,7 +45,7 @@
#include "net/cookies/cookie_monster.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/network/network_context.h"
#include "services/network/network_service.h"
#include "services/network/public/cpp/features.h"
diff --git a/content/browser/storage_partition_impl_unittest.cc b/content/browser/storage_partition_impl_unittest.cc
index 2493de297e6a3..7bc32d4957f7f 100644
--- a/content/browser/storage_partition_impl_unittest.cc
+++ b/content/browser/storage_partition_impl_unittest.cc
@@ -28,7 +28,7 @@
#include "net/cookies/cookie_store.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "storage/browser/quota/quota_manager.h"
#include "storage/browser/test/mock_quota_manager.h"
#include "storage/browser/test/mock_special_storage_policy.h"
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 4b1f871c29463..106541b9d662d 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -128,7 +128,7 @@
#include "net/traffic_annotation/network_traffic_annotation.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/device/public/mojom/constants.mojom.h"
#include "services/metrics/public/cpp/ukm_recorder.h"
#include "services/service_manager/public/cpp/connector.h"
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index f2656a288bcdd..076232d64a577 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -49,7 +49,7 @@
#include "content/public/common/three_d_api_types.h"
#include "net/base/load_states.h"
#include "net/http/http_response_headers.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/device/public/mojom/geolocation_context.mojom.h"
#include "services/device/public/mojom/wake_lock.mojom.h"
#include "services/metrics/public/cpp/ukm_recorder.h"
diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
index 30ae3d821e26e..aba5da0895837 100644
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -4,7 +4,7 @@
import("//build/config/features.gni")
import("//build/config/ui.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
import("//third_party/WebKit/public/public_features.gni")
if (is_component_build) {
diff --git a/content/child/font_warmup_win.cc b/content/child/font_warmup_win.cc
index b53988b893f37..d9e98c1f79060 100644
--- a/content/child/font_warmup_win.cc
+++ b/content/child/font_warmup_win.cc
@@ -23,7 +23,7 @@
#include "base/win/iat_patch_function.h"
#include "base/win/windows_version.h"
#include "build/build_config.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "skia/ext/fontmgr_default_win.h"
#include "third_party/skia/include/core/SkRefCnt.h"
#include "third_party/skia/include/ports/SkFontMgr.h"
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index e2988ce956da8..198e805f356fe 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -9,7 +9,7 @@ import("//build/config/ui.gni")
import("//ipc/features.gni")
import("//media/media_options.gni")
import("//mojo/public/tools/bindings/mojom.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
import("//sandbox/features.gni")
import("//tools/ipc_fuzzer/ipc_fuzzer.gni")
if (is_mac) {
@@ -360,7 +360,7 @@ source_set("common") {
"//mojo/common:common_base",
"//mojo/edk",
"//net",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//sandbox",
"//sandbox:sandbox_features",
"//services/network/public/cpp",
diff --git a/content/common/all_messages.h b/content/common/all_messages.h
index 31cc3abb117f2..be7d1f42c7055 100644
--- a/content/common/all_messages.h
+++ b/content/common/all_messages.h
@@ -8,7 +8,7 @@
// ipc/ipc_message_start.h to ensure the corresponding message file is
// included here.
//
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "content/common/content_message_generator.h"
#if BUILDFLAG(ENABLE_PLUGINS)
diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h
index 3963944289919..de78673843299 100644
--- a/content/common/frame_messages.h
+++ b/content/common/frame_messages.h
@@ -52,7 +52,7 @@
#include "ipc/ipc_message_macros.h"
#include "ipc/ipc_platform_file.h"
#include "mojo/public/cpp/system/message_pipe.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "third_party/WebKit/public/common/feature_policy/feature_policy.h"
#include "third_party/WebKit/public/common/frame/frame_policy.h"
#include "third_party/WebKit/public/common/message_port/message_port_channel.h"
diff --git a/content/common/native_types.typemap b/content/common/native_types.typemap
index 0e6304413db93..7d50926f0fa9a 100644
--- a/content/common/native_types.typemap
+++ b/content/common/native_types.typemap
@@ -51,7 +51,7 @@ public_deps = [
"//media",
"//media/base/ipc",
"//net",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//services/network/public/cpp",
"//third_party/WebKit/public/common",
"//ui/accessibility",
diff --git a/content/common/pepper_file_util.h b/content/common/pepper_file_util.h
index 48afdeb7ed7dc..bded20a985787 100644
--- a/content/common/pepper_file_util.h
+++ b/content/common/pepper_file_util.h
@@ -7,8 +7,8 @@
#include "base/files/file.h"
#include "base/sync_socket.h"
+#include "ppapi/buildflags/buildflags.h"
#include "ppapi/c/pp_file_info.h"
-#include "ppapi/features/features.h"
#include "storage/common/fileapi/file_system_types.h"
#if !BUILDFLAG(ENABLE_PLUGINS)
diff --git a/content/common/pepper_plugin_list.h b/content/common/pepper_plugin_list.h
index fdf569a42f509..44f3341631bc1 100644
--- a/content/common/pepper_plugin_list.h
+++ b/content/common/pepper_plugin_list.h
@@ -7,7 +7,7 @@
#include <vector>
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#if !BUILDFLAG(ENABLE_PLUGINS)
#error "Plugins should be enabled"
diff --git a/content/common/pepper_renderer_instance_data.h b/content/common/pepper_renderer_instance_data.h
index a3445ecee73c3..23dc106317a6e 100644
--- a/content/common/pepper_renderer_instance_data.h
+++ b/content/common/pepper_renderer_instance_data.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_COMMON_PEPPER_RENDERER_INSTANCE_DATA_H_
#define CONTENT_COMMON_PEPPER_RENDERER_INSTANCE_DATA_H_
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "url/gurl.h"
#if !BUILDFLAG(ENABLE_PLUGINS)
diff --git a/content/common/plugin_list.h b/content/common/plugin_list.h
index 0504985133c30..59aa05d47c45b 100644
--- a/content/common/plugin_list.h
+++ b/content/common/plugin_list.h
@@ -18,7 +18,7 @@
#include "build/build_config.h"
#include "content/common/content_export.h"
#include "content/public/common/webplugininfo.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#if !BUILDFLAG(ENABLE_PLUGINS)
#error "Plugins should be enabled"
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index 502c59a5b5bec..6a3bbc490bda3 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -44,7 +44,7 @@
#include "media/base/ipc/media_param_traits.h"
#include "media/capture/ipc/capture_param_traits.h"
#include "net/base/network_change_notifier.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "third_party/WebKit/public/platform/WebDisplayMode.h"
#include "third_party/WebKit/public/platform/WebFloatPoint.h"
#include "third_party/WebKit/public/platform/WebFloatRect.h"
diff --git a/content/ppapi_plugin/BUILD.gn b/content/ppapi_plugin/BUILD.gn
index da7a2938a9887..325836aaf221b 100644
--- a/content/ppapi_plugin/BUILD.gn
+++ b/content/ppapi_plugin/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
assert(enable_plugins, "PPAPI plugins must be enabled.")
diff --git a/content/public/child/BUILD.gn b/content/public/child/BUILD.gn
index 25529f6fdfbbb..296eca953d416 100644
--- a/content/public/child/BUILD.gn
+++ b/content/public/child/BUILD.gn
@@ -3,7 +3,7 @@
# found in the LICENSE file.
import("//build/config/jumbo.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
# See //content/BUILD.gn for how this works.
group("child") {
diff --git a/content/public/common/BUILD.gn b/content/public/common/BUILD.gn
index 41ea9316c10f8..445aea37d9180 100644
--- a/content/public/common/BUILD.gn
+++ b/content/public/common/BUILD.gn
@@ -10,7 +10,7 @@ import("//build/config/ui.gni")
import("//content/public/common/zygote_features.gni")
import("//media/media_options.gni")
import("//mojo/public/tools/bindings/mojom.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
import("//third_party/webrtc/webrtc.gni")
# See //content/BUILD.gn for how this works.
@@ -281,8 +281,8 @@ jumbo_source_set("common_sources") {
"//content/common:mojo_bindings",
"//media",
"//mojo/common",
+ "//ppapi/buildflags",
"//ppapi/c",
- "//ppapi/features",
"//services/network/public/cpp",
"//services/service_manager/public/cpp",
"//skia",
diff --git a/content/public/common/pepper_plugin_info.h b/content/public/common/pepper_plugin_info.h
index 7a6e82e5973e1..753bff723ad0a 100644
--- a/content/public/common/pepper_plugin_info.h
+++ b/content/public/common/pepper_plugin_info.h
@@ -13,9 +13,9 @@
#include "base/files/file_path.h"
#include "content/common/content_export.h"
#include "content/public/common/webplugininfo.h"
+#include "ppapi/buildflags/buildflags.h"
#include "ppapi/c/pp_module.h"
#include "ppapi/c/ppb.h"
-#include "ppapi/features/features.h"
#if !BUILDFLAG(ENABLE_PLUGINS)
#error "Plugins should be enabled"
diff --git a/content/public/renderer/BUILD.gn b/content/public/renderer/BUILD.gn
index 481fb69ed26a3..0a0b2553b4a6f 100644
--- a/content/public/renderer/BUILD.gn
+++ b/content/public/renderer/BUILD.gn
@@ -5,7 +5,7 @@
import("//build/config/features.gni")
import("//build/config/jumbo.gni")
import("//media/media_options.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
# See //content/BUILD.gn for how this works.
group("renderer") {
@@ -91,8 +91,8 @@ target(link_target_type, "renderer_sources") {
"//media/capture",
"//media/gpu/ipc/client",
"//net",
+ "//ppapi/buildflags",
"//ppapi/c",
- "//ppapi/features",
"//skia",
"//third_party/WebKit/public:blink_headers",
"//third_party/widevine/cdm:headers",
diff --git a/content/public/renderer/render_frame.h b/content/public/renderer/render_frame.h
index 78472443a5f9b..8206958985bac 100644
--- a/content/public/renderer/render_frame.h
+++ b/content/public/renderer/render_frame.h
@@ -17,7 +17,7 @@
#include "content/public/common/previews_state.h"
#include "ipc/ipc_listener.h"
#include "ipc/ipc_sender.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/network/public/mojom/url_loader_factory.mojom.h"
#include "services/service_manager/public/cpp/binder_registry.h"
#include "third_party/WebKit/public/mojom/page/page_visibility_state.mojom.h"
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
index f26a29f126cfa..8bc9b1f5b747a 100644
--- a/content/renderer/BUILD.gn
+++ b/content/renderer/BUILD.gn
@@ -9,7 +9,7 @@ import("//build/config/ui.gni")
import("//build/split_static_library.gni")
import("//content/common/features.gni")
import("//media/media_options.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
import("//printing/features/features.gni")
import("//third_party/webrtc/webrtc.gni")
import("//tools/ipc_fuzzer/ipc_fuzzer.gni")
@@ -565,7 +565,7 @@ target(link_target_type, "renderer") {
"//mojo/common",
"//mojo/public/cpp/bindings",
"//net",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//printing/features",
"//sandbox",
"//services/device/public/cpp/generic_sensor",
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index f302cf942438b..0128034573a28 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -158,7 +158,7 @@
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
#include "net/http/http_request_headers.h"
#include "net/http/http_util.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/network/public/cpp/features.h"
#include "services/network/public/mojom/request_context_frame_type.mojom.h"
#include "services/service_manager/public/cpp/connector.h"
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 0423799d63454..1b1c7e717c60c 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -62,7 +62,7 @@
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/public/cpp/system/data_pipe.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/network/public/mojom/url_loader_factory.mojom.h"
#include "services/service_manager/public/cpp/bind_source_info.h"
#include "services/service_manager/public/cpp/binder_registry.h"
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 0a23742a13e3c..220aa59ee07d7 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -144,7 +144,7 @@
#include "net/base/port_util.h"
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
#include "net/base/url_util.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/metrics/public/cpp/mojo_ukm_recorder.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/public/cpp/interface_provider.h"
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index a6a14b8e30329..c68cbc20d9bc4 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -106,7 +106,7 @@
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
#include "net/http/http_util.h"
#include "net/nqe/effective_connection_type.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "skia/ext/platform_canvas.h"
#include "third_party/WebKit/public/common/associated_interfaces/associated_interface_provider.h"
#include "third_party/WebKit/public/mojom/page/page_visibility_state.mojom.h"
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 472f0d1ad2836..358d1277ba899 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -69,7 +69,7 @@
#include "ipc/ipc_message_start.h"
#include "ipc/ipc_sync_message.h"
#include "ipc/ipc_sync_message_filter.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "skia/ext/platform_canvas.h"
#include "third_party/WebKit/public/platform/FilePathConversion.h"
#include "third_party/WebKit/public/platform/WebCursorInfo.h"
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index 62fd85159f9c2..4568e4168f5b5 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -46,7 +46,7 @@
#include "ipc/ipc_message.h"
#include "ipc/ipc_sender.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "third_party/WebKit/public/platform/WebDisplayMode.h"
#include "third_party/WebKit/public/platform/WebInputEvent.h"
#include "third_party/WebKit/public/platform/WebRect.h"
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index 84ac510522b60..dd2ece188e098 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -92,7 +92,7 @@
#include "mojo/public/cpp/bindings/strong_associated_binding.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/public/cpp/system/platform_handle.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/device/public/cpp/generic_sensor/motion_data.h"
#include "services/network/public/cpp/features.h"
#include "services/service_manager/public/cpp/connector.h"
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index b7c191111a54e..e8aff83ce331e 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -32,7 +32,7 @@
#include "content/renderer/render_thread_impl.h"
#include "content/renderer/renderer_main_platform_delegate.h"
#include "media/media_buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "third_party/WebKit/public/platform/scheduler/renderer/renderer_scheduler.h"
#include "third_party/skia/include/core/SkGraphics.h"
#include "ui/base/ui_base_switches.h"
diff --git a/content/renderer/text_input_client_observer.cc b/content/renderer/text_input_client_observer.cc
index 5252466a68c58..0d8df0b0d36ea 100644
--- a/content/renderer/text_input_client_observer.cc
+++ b/content/renderer/text_input_client_observer.cc
@@ -15,7 +15,7 @@
#include "content/renderer/render_view_impl.h"
#include "content/renderer/render_widget.h"
#include "ipc/ipc_message.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "third_party/WebKit/public/platform/WebPoint.h"
#include "third_party/WebKit/public/platform/WebRect.h"
#include "third_party/WebKit/public/platform/WebString.h"
diff --git a/content/renderer/text_input_client_observer.h b/content/renderer/text_input_client_observer.h
index e2ce697ea4cac..c2c4855615500 100644
--- a/content/renderer/text_input_client_observer.h
+++ b/content/renderer/text_input_client_observer.h
@@ -8,7 +8,7 @@
#include "base/macros.h"
#include "build/build_config.h"
#include "content/public/renderer/render_view_observer.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/range/range.h"
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index 1d0243a14f9a7..1bd71a322a247 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -9,7 +9,7 @@ import("//build/config/win/console_app.gni")
import("//build/config/win/manifest.gni")
import("//media/media_options.gni")
import("//mojo/public/tools/bindings/mojom.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
import("//services/service_manager/public/service_manifest.gni")
import("//tools/grit/grit_rule.gni")
import("//tools/grit/repack.gni")
@@ -273,7 +273,7 @@ static_library("content_shell_lib") {
"//net",
"//net:net_resources",
"//net:test_support",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//sandbox",
"//services/device/public/mojom",
"//services/network/public/cpp",
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index 243f32169908d..4ff4b8d4573f7 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -40,7 +40,7 @@
#include "ipc/ipc_buildflags.h"
#include "media/base/media_switches.h"
#include "net/cookies/cookie_monster.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/network/public/cpp/network_switches.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
diff --git a/content/shell/browser/layout_test/layout_test_browser_main_parts.cc b/content/shell/browser/layout_test/layout_test_browser_main_parts.cc
index 7f01424a9aaab..e07f088f483db 100644
--- a/content/shell/browser/layout_test/layout_test_browser_main_parts.cc
+++ b/content/shell/browser/layout_test/layout_test_browser_main_parts.cc
@@ -26,7 +26,7 @@
#include "net/base/filename_util.h"
#include "net/base/net_module.h"
#include "net/grit/net_resources.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "ui/base/resource/resource_bundle.h"
#include "url/gurl.h"
diff --git a/content/shell/browser/layout_test/layout_test_browser_main_parts.h b/content/shell/browser/layout_test/layout_test_browser_main_parts.h
index 78a17dfb7b538..1134d2bd4242b 100644
--- a/content/shell/browser/layout_test/layout_test_browser_main_parts.h
+++ b/content/shell/browser/layout_test/layout_test_browser_main_parts.h
@@ -10,7 +10,7 @@
#include "base/macros.h"
#include "build/build_config.h"
#include "content/shell/browser/shell_browser_main_parts.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
namespace content {
diff --git a/content/shell/renderer/shell_content_renderer_client.cc b/content/shell/renderer/shell_content_renderer_client.cc
index 725d161502158..dd59ab51a9008 100644
--- a/content/shell/renderer/shell_content_renderer_client.cc
+++ b/content/shell/renderer/shell_content_renderer_client.cc
@@ -23,7 +23,7 @@
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/system/message_pipe.h"
#include "net/base/net_errors.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "services/service_manager/public/cpp/binder_registry.h"
#include "third_party/WebKit/public/platform/WebURLError.h"
#include "third_party/WebKit/public/web/WebTestingSupport.h"
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index d0f111e274200..1668b654480a5 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -12,7 +12,7 @@ import("//build/config/ui.gni")
import("//media/media_options.gni")
import("//net/features.gni")
import("//mojo/public/tools/bindings/mojom.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
import("//services/catalog/public/tools/catalog.gni")
import("//services/service_manager/public/service_manifest.gni")
import("//testing/test.gni")
@@ -903,7 +903,7 @@ test("content_browsertests") {
"//mojo/edk",
"//mojo/public/cpp/bindings",
"//net:test_support",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//services/audio/public/cpp",
"//services/catalog:lib",
"//services/device/public/cpp:device_features",
@@ -1717,8 +1717,8 @@ test("content_unittests") {
"//mojo/public/cpp/test_support:test_utils",
"//net:extras",
"//net:test_support",
+ "//ppapi/buildflags",
"//ppapi/c",
- "//ppapi/features",
"//printing",
"//services/catalog:lib",
"//services/device/public/cpp/generic_sensor",
diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc
index 7485478ddb798..e0a0280b289e7 100644
--- a/content/zygote/zygote_main_linux.cc
+++ b/content/zygote/zygote_main_linux.cc
@@ -39,7 +39,7 @@
#include "content/public/common/zygote_fork_delegate_linux.h"
#include "content/zygote/zygote_linux.h"
#include "media/media_buildflags.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
#include "sandbox/linux/services/credentials.h"
#include "sandbox/linux/services/init_process_reaper.h"
#include "sandbox/linux/services/libc_interceptor.h"
diff --git a/extensions/browser/BUILD.gn b/extensions/browser/BUILD.gn
index b7e9247ba748d..92386f4a38545 100644
--- a/extensions/browser/BUILD.gn
+++ b/extensions/browser/BUILD.gn
@@ -385,7 +385,7 @@ jumbo_source_set("browser_sources") {
"//extensions/common/api",
"//extensions/strings",
"//google_apis",
- "//ppapi/features",
+ "//ppapi/buildflags",
"//services/device/public/mojom",
"//services/preferences/public/cpp",
"//services/service_manager/public/cpp",
diff --git a/extensions/browser/DEPS b/extensions/browser/DEPS
index a4177cb34724e..9995622984a7a 100644
--- a/extensions/browser/DEPS
+++ b/extensions/browser/DEPS
@@ -23,7 +23,7 @@ include_rules = [
"+grit/extensions_strings.h",
"+net",
# This directory contains build flags and does not pull all of PPAPI in.
- "+ppapi/features",
+ "+ppapi/buildflags",
"+services/data_decoder/public",
"+services/network/public/cpp",
"+services/network/public/mojom",
diff --git a/extensions/browser/guest_view/web_view/web_view_permission_helper.cc b/extensions/browser/guest_view/web_view/web_view_permission_helper.cc
index 233b411b54fd0..e628d389b9cb7 100644
--- a/extensions/browser/guest_view/web_view/web_view_permission_helper.cc
+++ b/extensions/browser/guest_view/web_view/web_view_permission_helper.cc
@@ -19,7 +19,7 @@
#include "extensions/browser/guest_view/web_view/web_view_guest.h"
#include "extensions/browser/guest_view/web_view/web_view_permission_helper_delegate.h"
#include "extensions/browser/guest_view/web_view/web_view_permission_types.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
using base::UserMetricsAction;
using content::BrowserPluginGuestDelegate;
diff --git a/extensions/browser/guest_view/web_view/web_view_permission_helper.h b/extensions/browser/guest_view/web_view/web_view_permission_helper.h
index 65fad3ffe93fb..4e3a7f0f53f15 100644
--- a/extensions/browser/guest_view/web_view/web_view_permission_helper.h
+++ b/extensions/browser/guest_view/web_view/web_view_permission_helper.h
@@ -15,7 +15,7 @@
#include "content/public/browser/web_contents_observer.h"
#include "content/public/common/media_stream_request.h"
#include "extensions/browser/guest_view/web_view/web_view_permission_types.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
namespace extensions {
diff --git a/ppapi/BUILD.gn b/ppapi/BUILD.gn
index 36090e4ce2184..1b07e620bad41 100644
--- a/ppapi/BUILD.gn
+++ b/ppapi/BUILD.gn
@@ -6,7 +6,7 @@ import("//build/config/features.gni")
import("//build/config/nacl/config.gni")
import("//build/config/nacl/rules.gni")
import("//components/nacl/features.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
import("//testing/test.gni")
if (is_mac) {
import("//build/config/mac/rules.gni")
diff --git a/ppapi/features/BUILD.gn b/ppapi/buildflags/BUILD.gn
similarity index 80%
rename from ppapi/features/BUILD.gn
rename to ppapi/buildflags/BUILD.gn
index f24fe7b20b784..4dfdc7a5b335c 100644
--- a/ppapi/features/BUILD.gn
+++ b/ppapi/buildflags/BUILD.gn
@@ -3,13 +3,13 @@
# found in the LICENSE file.
import("//build/buildflag_header.gni")
-import("//ppapi/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
# This file is in a separate directory so all targets in the build can refer to
# the buildflag header to get the necessary preprocessor defines without
# bringing in all of Pepper.
-buildflag_header("features") {
- header = "features.h"
+buildflag_header("buildflags") {
+ header = "buildflags.h"
flags = [ "ENABLE_PLUGINS=$enable_plugins" ]
}
diff --git a/ppapi/features/features.gni b/ppapi/buildflags/buildflags.gni
similarity index 100%
rename from ppapi/features/features.gni
rename to ppapi/buildflags/buildflags.gni
diff --git a/third_party/widevine/cdm/DEPS b/third_party/widevine/cdm/DEPS
index ae3be09a61575..b5fa9620f0fb2 100644
--- a/third_party/widevine/cdm/DEPS
+++ b/third_party/widevine/cdm/DEPS
@@ -1,4 +1,4 @@
include_rules = [
"+media/media_buildflags.h",
- "+ppapi/features",
+ "+ppapi/buildflags",
]