Update background process store extension

brave · Nov 23, 2017 · c5d88ea · c5d88ea
1 parent 5eec8e6
commit c5d88ea
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 54 deletions.
diff --git a/DEPS b/DEPS
@@ -5,7 +5,7 @@ deps = {
   "vendor/tracking-protection": "https://github.com/brave/tracking-protection.git@0931529eba33109c6b3946a83295577fea540045",
   "vendor/hashset-cpp": "https://github.com/bbondy/hashset-cpp.git@f427324d667d7188a9e0975cca7f3a8c06226b4d",
   "vendor/bloom-filter-cpp": "https://github.com/bbondy/bloom-filter-cpp.git@6faa14ececa33badad149c40f94ff9867159681c",
-  "vendor/brave-extension": "https://github.com/brave/brave-extension.git@64aa807bcf16effabc4a37cfed696e077a6c1974",
+  "vendor/brave-extension": "https://github.com/brave/brave-extension.git@4e7c8782e6d8c0f07b626d8f36c86093bcc7b687",
   "vendor/requests": "https://github.com/kennethreitz/requests@e4d59bedfd3c7f4f254f4f5d036587bcd8152458",
   "vendor/boto": "https://github.com/boto/boto@f7574aa6cc2c819430c1f05e9a1a1a666ef8169b",
   "vendor/python-patch": "https://github.com/svn2github/python-patch@a336a458016ced89aba90dfc3f4c8222ae3b1403",

diff --git a/common/extensions/api/BUILD.gn b/common/extensions/api/BUILD.gn
diff --git a/common/extensions/api/brave_shields.json b/common/extensions/api/brave_shields.json
diff --git a/components/brave_shields/browser/brave_shields_resource_throttle.cc b/components/brave_shields/browser/brave_shields_resource_throttle.cc
@@ -9,7 +9,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "brave/common/extensions/api/brave_shields.h"
+#include "chrome/common/extensions/api/brave_shields.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"

diff --git a/patches/master_patch.patch b/patches/master_patch.patch
@@ -335,26 +335,22 @@ index 99a3f816756039a628dc3032cbda3971dd415138..2cf32156411bd3a28e8c8096e25dcee5
  #error Unknown branding
  #endif
 diff --git a/chrome/common/extensions/api/BUILD.gn b/chrome/common/extensions/api/BUILD.gn
-index ad3703177d68941b91d570bcfa001848ffa179a9..a6eb9e854322f84a0d37c91218fd3bd93b412573 100644
+index ad3703177d68941b91d570bcfa001848ffa179a9..727d534ae2bce1e5f1105cf2c3a2318f10302b6d 100644
 --- a/chrome/common/extensions/api/BUILD.gn
 +++ b/chrome/common/extensions/api/BUILD.gn
-@@ -83,6 +83,8 @@ schema_sources = [
-   "webstore_private.json",
+@@ -84,6 +84,12 @@ schema_sources = [
    "webstore_widget_private.idl",
    "windows.json",
-+
-+  "//brave/common/extensions/api/brave_shields.json",
  ]
++
++# Add Brave extension resources here
++schema_sources += [
++  "brave_shields.json"
++]
++
  if (!is_android) {
    schema_sources += [ "processes.idl" ]
-@@ -194,6 +196,7 @@ json_schema_api("api") {
-   root_namespace = extensions_api_root_namespace
-   deps = [
-     "//extensions/common/api",
-+    "//brave/common/extensions/api",
-   ]
  }
-
 diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/extensions/api/_api_features.json
 index 8ec1de091af1a17127e66bc67c6ee7cb8b5c2be3..0686739f34df6198129d2a9a363fba00da4a537e 100644
 --- a/chrome/common/extensions/api/_api_features.json