brave · bridiver · Jul 4, 2018 · Jul 4, 2018 · Jul 5, 2018 · Jul 6, 2018
diff --git a/BUILD.gn b/BUILD.gn
@@ -576,7 +576,7 @@ if (is_win) {
   chromedriver = "$chromedriver.exe"
 }
 
-chromedriver_version = "2.38"
+chromedriver_version = "2.40"
 
 copy("electron_chromedriver_dist_resources") {
   sources = [

diff --git a/DEPS b/DEPS
@@ -1,7 +1,7 @@
 use_relative_paths = True
 
 deps = {
-  "vendor/node": "https://github.com/brave/node.git@18f874a7222698fee07c977b84dc6082e114e185",
+  "vendor/node": "https://github.com/brave/node.git@86deba03b1b5a9c391dd8dfaec9f02cdf59b59f1",
   "vendor/ad-block": "https://github.com/brave/ad-block.git@5377ddea390a0641d99556e0cf9d9c15b8ef275c",
   "vendor/tracking-protection": "https://github.com/brave/tracking-protection.git@bad1cf834508eab25ba6051d04edfb4d68e45401",
   "vendor/hashset-cpp": "https://github.com/brave/hashset-cpp.git@edd90e8215ea34582811446a143a7c8063f535f0",

diff --git a/app/linux/BUILD.gn b/app/linux/BUILD.gn
@@ -21,7 +21,6 @@ executable("electron_app") {
      "//electron:electron_framework_resources",
      "//electron:electron_app_resources",
      "//base",
-     "//build/config:exe_and_shlib_deps",
      "//third_party/fontconfig",
      "//chrome/common:constants",
      "//chrome/common:version_header",

diff --git a/app/mac/BUILD.gn b/app/mac/BUILD.gn
@@ -54,13 +54,12 @@ mac_app_bundle("electron_app") {
   ]
 
   sources = [
-    "//electron/chromium_src/chrome/app/chrome_exe_main_mac.c",
+    "//electron/chromium_src/chrome/app/chrome_exe_main_mac.cc",
   ]
 
   deps = [
     ":electron_versioned_bundle_data",
     "//electron:electron_app_resources",
-    "//build/config:exe_and_shlib_deps",
     "//chrome/common:version_header",
   ]
 
@@ -114,7 +113,6 @@ mac_framework_bundle("electron_framework") {
     "//chrome:chrome_framework_helpers",
     ":external_binaries_resources",
     "//electron:electron_framework_resources",
-    "//build/config:exe_and_shlib_deps",
     ":electron_xibs",
     "//chrome/app/nibs:localizer_table",
   ]
@@ -195,12 +193,12 @@ mac_app_bundle("electron_helper_app") {
   defines = [ "HELPER_EXECUTABLE" ]
 
   sources = [
-    "//electron/chromium_src/chrome/app/chrome_exe_main_mac.c",
+    "//electron/chromium_src/chrome/app/chrome_exe_main_mac.cc",
   ]
 
   deps = [
-    "//build/config:exe_and_shlib_deps",
     "//chrome/common:version_header",
+    "//sandbox/mac:seatbelt",
   ]
 
   ldflags = []

diff --git a/app/win/BUILD.gn b/app/win/BUILD.gn
@@ -76,7 +76,6 @@ executable("electron_exe") {
   deps = [
     ":electron_exe_version",
     ":electron_manifest",
-    "//build/config:exe_and_shlib_deps",
     "//electron:browser_dependencies",
     "//electron:child_dependencies",
     "//base",

diff --git a/atom/app/atom_main_delegate.cc b/atom/app/atom_main_delegate.cc
@@ -59,6 +59,7 @@
 #endif
 
 #if defined(OS_MACOSX)
+#include "atom/browser/mac/atom_application.h"
 #include "chrome/app/chrome_main_mac.h"
 #include "chrome/browser/mac/relauncher.h"
 #include "chrome/common/mac/cfbundle_blocker.h"
@@ -399,4 +400,10 @@ AtomMainDelegate::CreateContentClient() {
   return std::unique_ptr<brightray::ContentClient>(new AtomContentClient);
 }
 
+void AtomMainDelegate::PreContentInitialization() {
+#if defined(OS_MACOSX)
+  atom_application_mac::RegisterBrowserCrApp();
+#endif
+}
+
 }  // namespace atom
diff --git a/atom/app/atom_main_delegate.h b/atom/app/atom_main_delegate.h
@@ -47,6 +47,7 @@ class AtomMainDelegate : public brightray::MainDelegate {
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   void ZygoteForked() override;
 #endif
+  void PreContentInitialization() override;
 
 #if defined(OS_MACOSX)
   bool ShouldSendMachPort(const std::string& process_type) override;

diff --git a/atom/app/atom_main_delegate_mac.mm b/atom/app/atom_main_delegate_mac.mm
@@ -39,7 +39,6 @@
 
 void AtomMainDelegate::OverrideFrameworkBundlePath() {
   base::FilePath* version_path = new base::FilePath(GetFrameworksPath());
-  chrome::SetOverrideVersionedDirectory(version_path);
   base::mac::SetOverrideFrameworkBundlePath(
       GetFrameworksPath().Append(PRODUCT_SHORTNAME_STRING " Framework.framework"));
 }

diff --git a/atom/browser/BUILD.gn b/atom/browser/BUILD.gn
@@ -205,7 +205,6 @@ source_set("browser") {
       "native_window_mac.h",
       "native_window_mac.mm",
       "relauncher_mac.cc",
-      "ui/accelerator_util_mac.mm",
       "ui/cocoa/atom_menu_controller.h",
       "ui/cocoa/atom_menu_controller.mm",
       "ui/drag_util_mac.mm",
@@ -221,7 +220,6 @@ source_set("browser") {
       "api/atom_api_menu_views.h",
       "common_web_contents_delegate_views.cc",
       "native_window_views.h",
-      "ui/accelerator_util_views.cc",
       "ui/views/frameless_view.cc",
       "ui/views/frameless_view.h",
       "ui/views/menu_bar.cc",

diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc
@@ -68,6 +68,14 @@
 #include "base/strings/utf_string_conversions.h"
 #endif
 
+#if defined(OS_MACOSX)
+#import <CoreFoundation/CoreFoundation.h>
+#endif
+
+#if defined(OS_LINUX)
+#include <locale.h>
+#endif
+
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "brave/browser/api/brave_api_extension.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ -714,6 +722,67 @@ void App::SetLocale(std::string locale) {
   g_browser_process->SetApplicationLocale(locale);
 }
 
+std::string App::GetCountryName() {
+  std::string country = "";
+
+  #if defined(OS_WIN)
+  // for more info, see:
+  // https://docs.microsoft.com/en-us/windows/desktop/api/winnls/nf-winnls-getlocaleinfoex
+  // https://docs.microsoft.com/en-us/windows/desktop/Intl/locale-slocalized-constants
+  WCHAR localized_country_name[80];
+  int country_name_length = GetLocaleInfoEx(
+    LOCALE_NAME_USER_DEFAULT,
+    LOCALE_SLOCALIZEDCOUNTRYNAME,
+    (LPWSTR)&localized_country_name,
+    sizeof(localized_country_name) / sizeof(WCHAR));
+  if (country_name_length > 0) {
+    base::WideToUTF8(localized_country_name,
+      country_name_length,
+      &country);
+  }
+
+  #elif defined(OS_MACOSX)
+  // for more info, see:
+  // https://developer.apple.com/documentation/corefoundation/1543547-cflocalegetvalue?language=objc
+  // https://developer.apple.com/documentation/corefoundation/cflocalekey?language=objc
+  CFLocaleRef cflocale = CFLocaleCopyCurrent();
+  CFStringRef country_code = (CFStringRef)CFLocaleGetValue(
+    cflocale, kCFLocaleCountryCode);
+  if (country_code) {
+    CFIndex kCountryNameLength = CFStringGetLength(country_code) + 1;
+    char localized_country_name[kCountryNameLength];
+    if (CFStringGetCString(country_code, localized_country_name,
+      kCountryNameLength, kCFStringEncodingUTF8)) {
+      country = std::string(localized_country_name);
+    }
+  }
+
+  #elif defined(OS_LINUX)
+  // for more info, see:
+  // https://en.cppreference.com/w/cpp/locale/setlocale
+  // https://www.gnu.org/software/libc/manual/html_node/Setting-the-Locale.html
+
+  // capture currently set locale (strdup since value gets clobbered)
+  const char* old_locale = setlocale(LC_ALL, NULL);
+  char* saved_locale = old_locale ? strdup(old_locale) : NULL;
+  if (saved_locale) {
+    // set C locale to user-preferred locale
+    setlocale(LC_ALL, "");
+    // get the name of this locale
+    const char* locale = setlocale(LC_ALL, NULL);
+    if (locale) {
+      country = std::string(locale);
+    }
+    // restore original locale
+    setlocale(LC_ALL, saved_locale);
+    free(saved_locale);
+  }
+
+  #endif
+
+  return country;
+}
+
 bool App::GetBooleanPref(const std::string& path) {
   return g_browser_process->local_state()->GetBoolean(path);
 }
@@ -954,6 +1023,7 @@ void App::BuildPrototype(
       .SetMethod("setDesktopName", &App::SetDesktopName)
       .SetMethod("getLocale", &App::GetLocale)
       .SetMethod("setLocale", &App::SetLocale)
+      .SetMethod("getCountryName", &App::GetCountryName)
       .SetMethod("getBooleanPref", &App::GetBooleanPref)
       .SetMethod("setBooleanPref", &App::SetBooleanPref)
       .SetMethod("makeSingleInstance", &App::MakeSingleInstance)

diff --git a/atom/browser/api/atom_api_app.h b/atom/browser/api/atom_api_app.h
@@ -117,6 +117,7 @@ class App : public AtomBrowserClient::Delegate,
   void SetDesktopName(const std::string& desktop_name);
   void SetLocale(std::string);
   std::string GetLocale();
+  std::string GetCountryName();
   void SetBooleanPref(const std::string& path, bool value);
   bool GetBooleanPref(const std::string& path);
   bool MakeSingleInstance(

diff --git a/atom/browser/api/atom_api_session.cc b/atom/browser/api/atom_api_session.cc
@@ -309,10 +309,10 @@ void DoCacheActionInIO(
 
 void SetCertVerifyProcInIO(
     const scoped_refptr<net::URLRequestContextGetter>& context_getter,
-    const AtomCertVerifier::VerifyProc& proc) {
+    AtomCertVerifier::VerifyProc proc) {
   auto request_context = context_getter->GetURLRequestContext();
   static_cast<AtomCertVerifier*>(request_context->cert_verifier())->
-      SetVerifyProc(proc);
+      SetVerifyProc(std::move(proc));
 }
 
 void ClearHostResolverCacheInIO(
@@ -492,15 +492,17 @@ void Session::SetDownloadPath(const base::FilePath& path) {
 void Session::SetCertVerifyProc(v8::Local<v8::Value> val,
                                 mate::Arguments* args) {
   AtomCertVerifier::VerifyProc proc;
-  if (!(val->IsNull() || mate::ConvertFromV8(args->isolate(), val, &proc))) {
-    args->ThrowError("Must pass null or function");
-    return;
-  }
+  // TODO(hferreiro)
+  // if (!(val->IsNull() ||
+  //      mate::ConvertFromV8(args->isolate(), val, std::move(proc)))) {
+  //  args->ThrowError("Must pass null or function");
+  //  return;
+  //}
 
-  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-      base::Bind(&SetCertVerifyProcInIO,
-                 request_context_getter_,
-                 proc));
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      base::BindOnce(&SetCertVerifyProcInIO, request_context_getter_,
+                     std::move(proc)));
 }
 
 void Session::SetPermissionRequestHandler(v8::Local<v8::Value> val,
@@ -511,7 +513,7 @@ void Session::SetPermissionRequestHandler(v8::Local<v8::Value> val,
     return;
   }
   auto permission_manager = static_cast<brave::BravePermissionManager*>(
-      profile_->GetPermissionManager());
+      profile_->GetPermissionControllerDelegate());
   permission_manager->SetPermissionRequestHandler(handler);
 }
 

diff --git a/atom/browser/api/atom_api_user_prefs.cc b/atom/browser/api/atom_api_user_prefs.cc
@@ -60,51 +60,51 @@ Profile* UserPrefs::profile() {
 }
 
 void UserPrefs::RegisterStringPref(const std::string& path,
-    const std::string& default_value, bool overlay) {
+    const std::string& default_value, bool persist) {
   profile()->pref_registry()->RegisterStringPref(path, default_value);
-  if (overlay)
-    profile()->AddOverlayPref(path);
+  if (persist)
+    profile()->RegisterPersistentPref(path);
 }
 
 void UserPrefs::RegisterDictionaryPref(const std::string& path,
-    const base::DictionaryValue& default_value, bool overlay) {
+    const base::DictionaryValue& default_value, bool persist) {
   std::unique_ptr<base::DictionaryValue> copied(
       default_value.CreateDeepCopy());
   profile()->pref_registry()->
       RegisterDictionaryPref(path, std::move(copied));
-  if (overlay)
-    profile()->AddOverlayPref(path);
+  if (persist)
+    profile()->RegisterPersistentPref(path);
 }
 
 void UserPrefs::RegisterListPref(const std::string& path,
-    const base::ListValue& default_value, bool overlay) {
+    const base::ListValue& default_value, bool persist) {
   std::unique_ptr<base::ListValue> copied(
       default_value.CreateDeepCopy());
   profile()->pref_registry()->
       RegisterListPref(path, std::move(copied));
-  if (overlay)
-    profile()->AddOverlayPref(path);
+  if (persist)
+    profile()->RegisterPersistentPref(path);
 }
 
 void UserPrefs::RegisterBooleanPref(const std::string& path,
-    bool default_value, bool overlay) {
+    bool default_value, bool persist) {
   profile()->pref_registry()->RegisterBooleanPref(path, default_value);
-  if (overlay)
-    profile()->AddOverlayPref(path);
+  if (persist)
+    profile()->RegisterPersistentPref(path);
 }
 
 void UserPrefs::RegisterIntegerPref(const std::string& path,
-    int default_value, bool overlay) {
+    int default_value, bool persist) {
   profile()->pref_registry()->RegisterIntegerPref(path, default_value);
-  if (overlay)
-    profile()->AddOverlayPref(path);
+  if (persist)
+    profile()->RegisterPersistentPref(path);
 }
 
 void UserPrefs::RegisterDoublePref(const std::string& path,
-    double default_value, bool overlay) {
+    double default_value, bool persist) {
   profile()->pref_registry()->RegisterDoublePref(path, default_value);
-  if (overlay)
-    profile()->AddOverlayPref(path);
+  if (persist)
+    profile()->RegisterPersistentPref(path);
 }
 
 std::string UserPrefs::GetStringPref(const std::string& path) {