Merge remote-tracking branch 'origin/upstream-master' into 79-based

Conflicts:
	chromium/chrome/common/pref_names.cc
	chromium/chrome/common/pref_names.h

Change-Id: I9be20fb8dfd946e3db1fa298dce076db5fd1f397

1 files changed, 35 insertions, 0 deletions

diff --git a/chromium/chrome/common/extensions/chrome_extensions_api_provider.h b/chromium/chrome/common/extensions/chrome_extensions_api_provider.h
new file mode 100644
index 00000000000..e3595d5536e
--- /dev/null
+++ b/chromium/chrome/common/extensions/chrome_extensions_api_provider.h
@@ -0,0 +1,35 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_COMMON_EXTENSIONS_CHROME_EXTENSIONS_API_PROVIDER_H_
+#define CHROME_COMMON_EXTENSIONS_CHROME_EXTENSIONS_API_PROVIDER_H_
+
+#include "base/macros.h"
+#include "extensions/common/extensions_api_provider.h"
+
+namespace extensions {
+
+class ChromeExtensionsAPIProvider : public ExtensionsAPIProvider {
+ public:
+  ChromeExtensionsAPIProvider();
+  ~ChromeExtensionsAPIProvider() override;
+
+  // ExtensionsAPIProvider:
+  void AddAPIFeatures(FeatureProvider* provider) override;
+  void AddManifestFeatures(FeatureProvider* provider) override;
+  void AddPermissionFeatures(FeatureProvider* provider) override;
+  void AddBehaviorFeatures(FeatureProvider* provider) override;
+  void AddAPIJSONSources(JSONFeatureProviderSource* json_source) override;
+  bool IsAPISchemaGenerated(const std::string& name) override;
+  base::StringPiece GetAPISchema(const std::string& name) override;
+  void RegisterPermissions(PermissionsInfo* permissions_info) override;
+  void RegisterManifestHandlers() override;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ChromeExtensionsAPIProvider);
+};
+
+}  // namespace extensions
+
+#endif  // CHROME_COMMON_EXTENSIONS_CHROME_EXTENSIONS_API_PROVIDER_H_