 diff --git a/build/config/chrome_build.gni b/build/config/chrome_build.gni
-index c649018a7a0aeb20caeb2bf37c60d57c48630f1b..2cf3e988c452a015c24956dda7cc4292ee56e2e3 100644
+index c649018a7a0aeb20caeb2bf37c60d57c48630f1b..e19fbe053444f8062b011a9ebfde502f682af940 100644
 --- a/build/config/chrome_build.gni
 +++ b/build/config/chrome_build.gni
-@@ -13,10 +13,12 @@ declare_args() {
+@@ -11,7 +11,9 @@ declare_args() {
+   # Break chrome.dll into multple pieces based on process type. Only available
+   # on Windows.
    is_multi_dll_chrome = is_win && !is_component_build
- }
- 
--# Refers to the subdirectory for branding in various places including
--# chrome/app/theme.
--if (is_chrome_branded) {
--  branding_path_component = "google_chrome"
--} else {
--  branding_path_component = "chromium"
-+declare_args() {
-+  # Refers to the subdirectory for branding in various places including
-+  # chrome/app/theme.
-+  if (is_chrome_branded) {
-+    branding_path_component = "google_chrome"
-+  } else {
-+    branding_path_component = "chromium"
-+  }
- }
+-}
++
++  # Build chromium without muon flags
++  muon_chromium_build = false
+ 
+ # Refers to the subdirectory for branding in various places including
+ # chrome/app/theme.
+@@ -20,3 +22,4 @@ if (is_chrome_branded) {
+ } else {
+   branding_path_component = "chromium"
+ }
++}
 diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn
 index 537c733e6873e3a4ed0d5609540fed92e46bae91..df12e8f7e067e7c7ccbd396cfbff108862764883 100644
 --- a/build/toolchain/mac/BUILD.gn

index 1d01ac835dbe810121a24de1a4014f1bd4de4307..ad65af2b0c4b02e11244455eb5a17b858f579fca 100644
--- a/content/browser/web_contents/web_contents_view_mac.mm
+++ b/content/browser/web_contents/web_contents_view_mac.mm
@@ -576,6 +576,7 @@ - (void)draggedImage:(NSImage*)anImage
              endedAt:(NSPoint)screenPoint
            operation:(NSDragOperation)operation {
   [dragSource_ endDragAt:screenPoint operation:operation];

   // Print stack traces to stderr when crashes occur. This opens up security
   // holes so it should never be enabled for official builds.
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
diff --git a/content/browser/frame_host/render_frame_message_filter.cc b/content/browser/frame_host/render_frame_message_filter.cc
index 93a1da4df0c069433eb6020cd198a722929658af..476d7ccd2b7f77e13e256a67de2fec9263b1aaaf 100644
--- a/content/browser/frame_host/render_frame_message_filter.cc
