1 files changed, 15 insertions, 16 deletions

diff --git a/www/chromium/files/patch-remoting_host_remoting_me2me_host.cc b/www/chromium/files/patch-remoting_host_remoting_me2me_host.cc
index c63aae5b0f98..3a8f8d1df4d0 100644
--- a/www/chromium/files/patch-remoting_host_remoting_me2me_host.cc
+++ b/www/chromium/files/patch-remoting_host_remoting_me2me_host.cc
@@ -1,23 +1,22 @@
---- remoting/host/remoting_me2me_host.cc.orig	2017-12-15 02:04:23.000000000 +0100
-+++ remoting/host/remoting_me2me_host.cc	2017-12-24 17:46:36.226255000 +0100
-@@ -116,14 +116,14 @@
+--- remoting/host/remoting_me2me_host.cc.orig	2018-03-20 23:05:29.000000000 +0100
++++ remoting/host/remoting_me2me_host.cc	2018-03-24 18:19:49.996963000 +0100
+@@ -115,13 +115,13 @@
  #include "base/mac/scoped_cftyperef.h"
  #endif  // defined(OS_MACOSX)
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
  #include <gtk/gtk.h>
- #include <X11/Xlib.h>
- #undef Status  // Xlib.h #defines this, which breaks protobuf headers.
- #include <base/linux_util.h>
+ #include "base/linux_util.h"
  #include "remoting/host/audio_capturer_linux.h"
  #include "remoting/host/linux/certificate_watcher.h"
+ #include "ui/gfx/x/x11.h"
 -#endif  // defined(OS_LINUX)
 +#endif  // defined(OS_LINUX) || defined(OS_BSD)
  
  #if defined(OS_WIN)
  #include <commctrl.h>
-@@ -158,11 +158,11 @@
+@@ -156,11 +156,11 @@
  const char kStdinConfigPath[] = "-";
  #endif  // !defined(REMOTING_MULTI_PROCESS)
  
@@ -31,7 +30,7 @@
  
  #if defined(OS_POSIX)
  // The command line switch used to pass name of the unix domain socket used to
-@@ -353,7 +353,7 @@
+@@ -351,7 +351,7 @@
  
    std::unique_ptr<ChromotingHostContext> context_;
  
@@ -40,7 +39,7 @@
    // Watch for certificate changes and kill the host when changes occur
    std::unique_ptr<CertificateWatcher> cert_watcher_;
  #endif
-@@ -566,10 +566,10 @@
+@@ -565,10 +565,10 @@
    enable_window_capture_ = cmd_line->HasSwitch(kWindowIdSwitchName);
    if (enable_window_capture_) {
  
@@ -53,7 +52,7 @@
  
      // uint32_t is large enough to hold window IDs on all platforms.
      uint32_t window_id;
-@@ -762,7 +762,7 @@
+@@ -761,7 +761,7 @@
      DCHECK(third_party_auth_config_.token_url.is_valid());
      DCHECK(third_party_auth_config_.token_validation_url.is_valid());
  
@@ -62,7 +61,7 @@
      if (!cert_watcher_) {
        cert_watcher_.reset(new CertificateWatcher(
            base::Bind(&HostProcess::ShutdownHost, this, kSuccessExitCode),
-@@ -848,7 +848,7 @@
+@@ -847,7 +847,7 @@
        base::Bind(&HostProcess::OnPolicyUpdate, base::Unretained(this)),
        base::Bind(&HostProcess::OnPolicyError, base::Unretained(this)));
  
@@ -71,7 +70,7 @@
    // If an audio pipe is specific on the command-line then initialize
    // AudioCapturerLinux to capture from it.
    base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()->
-@@ -857,7 +857,7 @@
+@@ -856,7 +856,7 @@
      remoting::AudioCapturerLinux::InitializePipeReader(
          context_->audio_task_runner(), audio_pipe_name);
    }
@@ -80,7 +79,7 @@
  
  #if defined(OS_POSIX)
    base::FilePath security_key_socket_name =
-@@ -915,7 +915,7 @@
+@@ -914,7 +914,7 @@
    // It is now safe for the HostProcess to be deleted.
    self_ = nullptr;
  
@@ -89,8 +88,8 @@
    // Cause the global AudioPipeReader to be freed, otherwise the audio
    // thread will remain in-use and prevent the process from exiting.
    // TODO(wez): DesktopEnvironmentFactory should own the pipe reader.
-@@ -1547,7 +1547,7 @@
-   host_->AddExtension(base::MakeUnique<TestEchoExtension>());
+@@ -1546,7 +1546,7 @@
+   host_->AddExtension(std::make_unique<TestEchoExtension>());
  
    // TODO(simonmorris): Get the maximum session duration from a policy.
 -#if defined(OS_LINUX)
@@ -98,7 +97,7 @@
    host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20));
  #endif
  
-@@ -1706,7 +1706,7 @@
+@@ -1705,7 +1705,7 @@
  int HostProcessMain() {
    HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION);