        ]
        #TODO(jrummell) Mac: 'DYLIB_INSTALL_NAME_BASE': '@loader_path',
      } else if (is_posix && !is_mac) {
+diff --git a/third_party/widevine/cdm/stub/manifest.json b/third_party/widevine/cdm/stub/manifest.json
+index d466ccd1e02ed8c158fda545fe2175c135018da5..16ae2a357b21de66b1558939f9333b3c22e9cff2 100644
+--- a/third_party/widevine/cdm/stub/manifest.json
++++ b/third_party/widevine/cdm/stub/manifest.json
+@@ -24,6 +24,11 @@
+       "os": "mac",
+       "arch": "x64",
+       "sub_package_path": "_platform_specific/mac_x64/"
++    },
++    {
++      "os": "linux",
++      "arch": "x64",
++      "sub_package_path": "_platform_specific/linux_x64/"
+     }
+   ]
+ }

   }
 
   bool ShouldSelectReplacement() const {
diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
index 76a36536f92ca5cc361e35cb8e27de1bbcc88327..004e678da6e383cfb97fbd7022d9faca35ec6581 100644
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

 
     if (delegate_)
       delegate_->PreSandboxStartup();
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
index abeb583eae5217510c35197703c5f702daa1df48..0c1750f8b3556b0e4b61d07a9428856b66780f44 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -880,6 +880,8 @@ void BrowserPluginGuest::OnDetach(int browser_plugin_instance_id) {
     rwhv->UnregisterFrameSinkId();
 
   delegate_->DidDetach();
+  // MUON(bbondy): Make sure GetGuestProxyRoutingID gets new info on re-attach
+  guest_proxy_routing_id_ = MSG_ROUTING_NONE;
 }
 
 void BrowserPluginGuest::OnDragStatusUpdate(int browser_plugin_instance_id,
diff --git a/content/browser/frame_host/render_frame_message_filter.cc b/content/browser/frame_host/render_frame_message_filter.cc
index c440d8061dacfa2e946abf4a3719c7c3246e0221..3246069a1114a018d57b6965fab1ea711c3d5646 100644
--- a/content/browser/frame_host/render_frame_message_filter.cc
