=== modified file 'CHROMIUM_VERSION'
--- CHROMIUM_VERSION	2015-05-05 19:10:05 +0000
+++ CHROMIUM_VERSION	2015-05-15 01:52:36 +0000
@@ -1,1 +1,5 @@
+<<<<<<< TREE
 44.0.2391.0
+=======
+43.0.2357.52
+>>>>>>> MERGE-SOURCE

=== modified file 'patches/enable-accelerated-canvas-on-arale.patch'
--- patches/enable-accelerated-canvas-on-arale.patch	2015-05-04 11:31:03 +0000
+++ patches/enable-accelerated-canvas-on-arale.patch	2015-05-15 01:52:36 +0000
@@ -4,7 +4,11 @@
 diff --git a/gpu/config/software_rendering_list_json.cc b/gpu/config/software_rendering_list_json.cc
 --- a/gpu/config/software_rendering_list_json.cc
 +++ b/gpu/config/software_rendering_list_json.cc
+<<<<<<< TREE
 @@ -1096,29 +1096,16 @@ LONG_STRING_CONST(
+=======
+@@ -1182,29 +1182,16 @@ LONG_STRING_CONST(
+>>>>>>> MERGE-SOURCE
        },
        "vendor_id": "0x8086",
        "device_id": ["0x2a02"],

=== modified file 'qt/VERSION'
--- qt/VERSION	2015-04-07 11:04:04 +0000
+++ qt/VERSION	2015-05-15 01:52:36 +0000
@@ -1,3 +1,7 @@
 MAJOR=1
+<<<<<<< TREE
 MINOR=8
 PATCH=0
+=======
+MINOR=7
+PATCH=8>>>>>>> MERGE-SOURCE

=== modified file 'shared/browser/oxide_browser_process_main.cc'
--- shared/browser/oxide_browser_process_main.cc	2015-05-11 14:47:21 +0000
+++ shared/browser/oxide_browser_process_main.cc	2015-05-15 01:52:36 +0000
@@ -242,6 +242,9 @@
   // Remove this when we implement a selection API (see bug #1324292)
   command_line->AppendSwitch(switches::kDisableTouchEditing);
 
+  // See https://launchpad.net/bugs/1442413
+  command_line->AppendSwitch("disable-mojo-channel");
+
   if (gl_impl == gfx::kGLImplementationNone ||
       IsEnvironmentOptionEnabled("DISABLE_GPU")) {
     command_line->AppendSwitch(switches::kDisableGpu);
@@ -267,6 +270,9 @@
   if (IsEnvironmentOptionEnabled("NO_SANDBOX")) {
     command_line->AppendSwitch(switches::kNoSandbox);
   } else {
+    // See https://launchpad.net/bugs/1447311
+    command_line->AppendSwitch(switches::kDisableNamespaceSandbox);
+
     if (IsEnvironmentOptionEnabled("DISABLE_SETUID_SANDBOX")) {
       command_line->AppendSwitch(switches::kDisableSetuidSandbox);
     }

=== modified file 'shared/browser/oxide_web_contents_unloader.cc'
--- shared/browser/oxide_web_contents_unloader.cc	2015-05-13 21:53:33 +0000
+++ shared/browser/oxide_web_contents_unloader.cc	2015-05-15 01:52:36 +0000
@@ -23,8 +23,35 @@
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+<<<<<<< TREE
+=======
+#include "base/supports_user_data.h"
+#include "content/public/browser/render_view_host.h"
+>>>>>>> MERGE-SOURCE
 #include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_observer.h"
+<<<<<<< TREE
+#include "content/public/browser/web_contents_observer.h"
+=======
+#include "content/public/browser/web_contents_observer.h"
+
+
+class WebContentsUnloaderObserver : public content::WebContentsObserver,
+                                    public base::SupportsUserData::Data {
+public:
+  explicit WebContentsUnloaderObserver(
+          content::WebContents* contents)
+      : content::WebContentsObserver(contents) {}
+  virtual ~WebContentsUnloaderObserver() {}
+
+  void RenderProcessGone(base::TerminationStatus status) override {
+    web_contents()->GetDelegate()->CloseContents(web_contents());
+  }
+};
+
+namespace {
+const char kWebContentsUnloaderObserverKey[] = "oxide_web_contents_unloader_observer_data";
+}
+>>>>>>> MERGE-SOURCE
 
 namespace oxide {
 
@@ -80,9 +107,17 @@
     return;
   }
 
+<<<<<<< TREE
   // To intercept render process crashes
   new WebContentsUnloaderObserver(contents.get());
 
+=======
+  content::WebContents* wc = contents.get();
+  wc->SetUserData(
+      kWebContentsUnloaderObserverKey,
+      new WebContentsUnloaderObserver(wc));
+
+>>>>>>> MERGE-SOURCE
   // So we can intercept CloseContents
   contents->SetDelegate(this);
 

=== modified file 'shared/browser/oxide_web_view.cc'
--- shared/browser/oxide_web_view.cc	2015-05-14 15:37:57 +0000
+++ shared/browser/oxide_web_view.cc	2015-05-15 01:52:36 +0000
@@ -1050,6 +1050,7 @@
 
 void WebView::FrameDeleted(content::RenderFrameHost* render_frame_host) {
   WebFrame* frame = WebFrame::FromRenderFrameHost(render_frame_host);
+<<<<<<< TREE
   if (!frame) {
     // When a frame is detached, we get notified before any of its children
     // are detached. If we hit this case, it means that this is a child of a
@@ -1072,6 +1073,23 @@
     frames.pop();
   }
 
+=======
+  if (!frame) {
+    // When a frame is detached, we get notified before any of its children
+    // are detached. If we hit this case, it means that this is a child of a
+    // frame that's being detached, and we've already deleted the corresponding
+    // WebFrame
+    return;
+  }
+
+  // This is a bit of a hack, but we need to process children now - see the
+  // comment above
+  for (size_t i = 0; i < frame->GetChildCount(); ++i) {
+    certificate_error_manager_.FrameDetached(frame->GetChildAt(i));
+  }
+
+  certificate_error_manager_.FrameDetached(frame);
+>>>>>>> MERGE-SOURCE
   WebFrame::Destroy(frame);
 }
 

=== modified file 'shared/shared.gyp'