BASELINE: Update Chromium to 56.0.2924.122

Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

9 files changed, 32 insertions, 63 deletions

diff --git a/chromium/ppapi/proxy/host_dispatcher.cc b/chromium/ppapi/proxy/host_dispatcher.cc
index 5d61429fa4b..a5fdfcaf1c9 100644
--- a/chromium/ppapi/proxy/host_dispatcher.cc
+++ b/chromium/ppapi/proxy/host_dispatcher.cc
@@ -156,11 +156,11 @@ bool HostDispatcher::Send(IPC::Message* msg) {
     // destroys the plugin module and in turn the dispatcher.
     ScopedModuleReference scoped_ref(this);
 
-    FOR_EACH_OBSERVER(SyncMessageStatusObserver, sync_status_observer_list_,
-                      BeginBlockOnSyncMessage());
+    for (auto& observer : sync_status_observer_list_)
+      observer.BeginBlockOnSyncMessage();
     bool result = Dispatcher::Send(msg);
-    FOR_EACH_OBSERVER(SyncMessageStatusObserver, sync_status_observer_list_,
-                      EndBlockOnSyncMessage());
+    for (auto& observer : sync_status_observer_list_)
+      observer.EndBlockOnSyncMessage();
 
     return result;
   } else {
diff --git a/chromium/ppapi/proxy/plugin_dispatcher.cc b/chromium/ppapi/proxy/plugin_dispatcher.cc
index f4621b3c328..c14a0196942 100644
--- a/chromium/ppapi/proxy/plugin_dispatcher.cc
+++ b/chromium/ppapi/proxy/plugin_dispatcher.cc
@@ -36,10 +36,6 @@
 #include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/shared_impl/resource.h"
 
-#if defined(OS_POSIX) && !defined(OS_NACL)
-#include "ipc/ipc_channel_posix.h"
-#endif
-
 namespace ppapi {
 namespace proxy {
 
diff --git a/chromium/ppapi/proxy/plugin_globals.cc b/chromium/ppapi/proxy/plugin_globals.cc
index 765ec647897..f2ee4efa500 100644
--- a/chromium/ppapi/proxy/plugin_globals.cc
+++ b/chromium/ppapi/proxy/plugin_globals.cc
@@ -4,11 +4,10 @@
 
 #include "ppapi/proxy/plugin_globals.h"
 
-#include "base/location.h"
 #include "base/macros.h"
-#include "base/single_thread_task_runner.h"
 #include "base/task_runner.h"
 #include "base/threading/thread.h"
+#include "base/threading/thread_task_runner_handle.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_sender.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
@@ -189,7 +188,7 @@ base::TaskRunner* PluginGlobals::GetFileTaskRunner() {
 void PluginGlobals::MarkPluginIsActive() {
   if (!plugin_recently_active_) {
     plugin_recently_active_ = true;
-    if (!GetBrowserSender() || !base::MessageLoop::current())
+    if (!GetBrowserSender() || !base::ThreadTaskRunnerHandle::IsSet())
       return;
     GetBrowserSender()->Send(new PpapiHostMsg_Keepalive());
     DCHECK(keepalive_throttle_interval_milliseconds_);
diff --git a/chromium/ppapi/proxy/ppapi_messages.h b/chromium/ppapi/proxy/ppapi_messages.h
index 968fe57bf36..f30a6946df2 100644
--- a/chromium/ppapi/proxy/ppapi_messages.h
+++ b/chromium/ppapi/proxy/ppapi_messages.h
@@ -94,18 +94,18 @@ IPC_ENUM_TRAITS_MAX_VALUE(ppapi::TCPSocketVersion,
                           ppapi::TCP_SOCKET_VERSION_1_1_OR_ABOVE)
 IPC_ENUM_TRAITS(PP_AudioSampleRate)
 IPC_ENUM_TRAITS_MAX_VALUE(PP_BlendMode, PP_BLENDMODE_LAST)
-IPC_ENUM_TRAITS_MAX_VALUE(PP_CdmExceptionCode, PP_CDMEXCEPTIONCODE_OUTPUTERROR)
-IPC_ENUM_TRAITS_MAX_VALUE(PP_CdmKeyStatus, PP_CDMKEYSTATUS_STATUSPENDING)
-IPC_ENUM_TRAITS_MAX_VALUE(PP_CdmMessageType, PP_CDMMESSAGETYPE_LICENSE_RELEASE)
+IPC_ENUM_TRAITS_MAX_VALUE(PP_CdmExceptionCode, PP_CDMEXCEPTIONCODE_MAX)
+IPC_ENUM_TRAITS_MAX_VALUE(PP_CdmKeyStatus, PP_CDMKEYSTATUS_MAX)
+IPC_ENUM_TRAITS_MAX_VALUE(PP_CdmMessageType, PP_CDMMESSAGETYPE_MAX)
 IPC_ENUM_TRAITS(PP_DeviceType_Dev)
-IPC_ENUM_TRAITS(PP_DecryptorStreamType)
+IPC_ENUM_TRAITS_MAX_VALUE(PP_DecryptorStreamType, PP_DECRYPTORSTREAMTYPE_MAX)
 IPC_ENUM_TRAITS_MAX_VALUE(PP_FileSystemType, PP_FILESYSTEMTYPE_ISOLATED)
 IPC_ENUM_TRAITS_MAX_VALUE(PP_FileType, PP_FILETYPE_OTHER)
 IPC_ENUM_TRAITS(PP_Flash_BrowserOperations_Permission)
 IPC_ENUM_TRAITS(PP_Flash_BrowserOperations_SettingType)
 IPC_ENUM_TRAITS(PP_FlashSetting)
 IPC_ENUM_TRAITS(PP_ImageDataFormat)
-IPC_ENUM_TRAITS_MAX_VALUE(PP_InitDataType, PP_INITDATATYPE_WEBM)
+IPC_ENUM_TRAITS_MAX_VALUE(PP_InitDataType, PP_INITDATATYPE_MAX)
 IPC_ENUM_TRAITS(PP_InputEvent_MouseButton)
 IPC_ENUM_TRAITS(PP_InputEvent_Type)
 IPC_ENUM_TRAITS_MAX_VALUE(PP_IsolatedFileSystemType_Private,
@@ -119,7 +119,7 @@ IPC_ENUM_TRAITS(PP_PrintOutputFormat_Dev)
 IPC_ENUM_TRAITS(PP_PrintScalingOption_Dev)
 IPC_ENUM_TRAITS_MAX_VALUE(PP_PrivateDuplexMode_Dev, PP_PRIVATEDUPLEXMODE_LAST)
 IPC_ENUM_TRAITS(PP_PrivateFontCharset)
-IPC_ENUM_TRAITS_MAX_VALUE(PP_SessionType, PP_SESSIONTYPE_PERSISTENT_RELEASE)
+IPC_ENUM_TRAITS_MAX_VALUE(PP_SessionType, PP_SESSIONTYPE_MAX)
 IPC_ENUM_TRAITS_MAX_VALUE(PP_TCPSocket_Option,
                           PP_TCPSOCKET_OPTION_RECV_BUFFER_SIZE)
 IPC_ENUM_TRAITS(PP_TextInput_Type)
diff --git a/chromium/ppapi/proxy/ppapi_proxy_test.cc b/chromium/ppapi/proxy/ppapi_proxy_test.cc
index ed70bb575b3..587d0de315d 100644
--- a/chromium/ppapi/proxy/ppapi_proxy_test.cc
+++ b/chromium/ppapi/proxy/ppapi_proxy_test.cc
@@ -67,10 +67,8 @@ PPB_Proxy_Private ppb_proxy_private = {
 base::ObserverList<ProxyTestHarnessBase> get_interface_handlers_;
 
 const void* MockGetInterface(const char* name) {
-  base::ObserverList<ProxyTestHarnessBase>::Iterator it(
-      &get_interface_handlers_);
-  while (ProxyTestHarnessBase* observer = it.GetNext()) {
-    const void* interface = observer->GetInterface(name);
+  for (auto& observer : get_interface_handlers_) {
+    const void* interface = observer.GetInterface(name);
     if (interface)
       return interface;
   }
@@ -549,19 +547,18 @@ void TwoWayTest::SetUp() {
   io_thread_.StartWithOptions(options);
   plugin_thread_.Start();
 
-  IPC::ChannelHandle local_handle, remote_handle;
-  IPC::Channel::GenerateMojoChannelHandlePair("TwoWayTestChannel",
-                                              &local_handle, &remote_handle);
+  mojo::MessagePipe pipe;
   base::WaitableEvent remote_harness_set_up(
       base::WaitableEvent::ResetPolicy::MANUAL,
       base::WaitableEvent::InitialState::NOT_SIGNALED);
   plugin_thread_.task_runner()->PostTask(
-      FROM_HERE, base::Bind(&SetUpRemoteHarness, remote_harness_, remote_handle,
-                            base::RetainedRef(io_thread_.task_runner()),
-                            &shutdown_event_, &remote_harness_set_up));
+      FROM_HERE,
+      base::Bind(&SetUpRemoteHarness, remote_harness_, pipe.handle0.release(),
+                 base::RetainedRef(io_thread_.task_runner()), &shutdown_event_,
+                 &remote_harness_set_up));
   remote_harness_set_up.Wait();
   local_harness_->SetUpHarnessWithChannel(
-      local_handle, io_thread_.task_runner().get(), &shutdown_event_,
+      pipe.handle1.release(), io_thread_.task_runner().get(), &shutdown_event_,
       true);  // is_client
 }
 
diff --git a/chromium/ppapi/proxy/proxy_channel.cc b/chromium/ppapi/proxy/proxy_channel.cc
index 23b0449fbae..fb4c8150070 100644
--- a/chromium/ppapi/proxy/proxy_channel.cc
+++ b/chromium/ppapi/proxy/proxy_channel.cc
@@ -53,13 +53,6 @@ void ProxyChannel::OnChannelError() {
   channel_.reset();
 }
 
-#if defined(OS_POSIX) && !defined(OS_NACL)
-base::ScopedFD ProxyChannel::TakeRendererFD() {
-  DCHECK(channel());
-  return channel()->TakeClientFileDescriptor();
-}
-#endif
-
 IPC::PlatformFileForTransit ProxyChannel::ShareHandleWithRemote(
       base::PlatformFile handle,
       bool should_close_source) {
diff --git a/chromium/ppapi/proxy/proxy_channel.h b/chromium/ppapi/proxy/proxy_channel.h
index 9d981da9e0e..8a6af71ebfa 100644
--- a/chromium/ppapi/proxy/proxy_channel.h
+++ b/chromium/ppapi/proxy/proxy_channel.h
@@ -102,9 +102,7 @@ class PPAPI_PROXY_EXPORT ProxyChannel
     return channel_.get();
   }
 
-#if defined(OS_POSIX) && !defined(OS_NACL)
-  base::ScopedFD TakeRendererFD();
-#endif
+  base::ProcessId peer_pid() { return peer_pid_; }
 
  protected:
   explicit ProxyChannel();
diff --git a/chromium/ppapi/proxy/proxy_completion_callback_factory.h b/chromium/ppapi/proxy/proxy_completion_callback_factory.h
index 71322b0ad66..4b8bafe676a 100644
--- a/chromium/ppapi/proxy/proxy_completion_callback_factory.h
+++ b/chromium/ppapi/proxy/proxy_completion_callback_factory.h
@@ -8,7 +8,7 @@
 #include <stdint.h>
 
 #include "base/logging.h"
-#include "base/message_loop/message_loop.h"
+#include "base/sequence_checker.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/utility/completion_callback_factory.h"
 
@@ -21,38 +21,26 @@ class ProxyNonThreadSafeThreadTraits {
  public:
   class RefCount {
    public:
-    RefCount() : ref_(0) {
-#ifndef NDEBUG
-      message_loop_ = base::MessageLoop::current();
-#endif
-    }
+    RefCount() : ref_(0) {}
 
     ~RefCount() {
-#ifndef NDEBUG
-      DCHECK(message_loop_ == base::MessageLoop::current());
-#endif
+      DCHECK(sequence_checker_.CalledOnValidSequence());
     }
 
     int32_t AddRef() {
-#ifndef NDEBUG
-      DCHECK(message_loop_ == base::MessageLoop::current());
-#endif
+      DCHECK(sequence_checker_.CalledOnValidSequence());
       return ++ref_;
     }
 
     int32_t Release() {
-#ifndef NDEBUG
-      DCHECK(message_loop_ == base::MessageLoop::current());
-#endif
+      DCHECK(sequence_checker_.CalledOnValidSequence());
       DCHECK(ref_ > 0);
       return --ref_;
     }
 
    private:
     int32_t ref_;
-#ifndef NDEBUG
-    base::MessageLoop* message_loop_;
-#endif
+    base::SequenceChecker sequence_checker_;
   };
 
   // No-op lock class.
diff --git a/chromium/ppapi/proxy/url_loader_resource.cc b/chromium/ppapi/proxy/url_loader_resource.cc
index 4ac345a2b80..e94901dda6c 100644
--- a/chromium/ppapi/proxy/url_loader_resource.cc
+++ b/chromium/ppapi/proxy/url_loader_resource.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/proxy/url_loader_resource.h"
 
+#include <algorithm>
+
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "ppapi/c/pp_completion_callback.h"
@@ -23,11 +25,6 @@ using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_URLLoader_API;
 using ppapi::thunk::PPB_URLRequestInfo_API;
 
-#ifdef _MSC_VER
-// Do not warn about use of std::copy with raw pointers.
-#pragma warning(disable : 4996)
-#endif
-
 namespace ppapi {
 namespace proxy {
 
@@ -219,7 +216,6 @@ void URLLoaderResource::Close() {
   Post(RENDERER, PpapiHostMsg_URLLoader_Close());
 
   // Abort the callbacks, the plugin doesn't want to be called back after this.
-  // TODO(brettw) this should fix bug 69457, mark it fixed. ============
   if (TrackedCallback::IsPending(pending_callback_))
     pending_callback_->PostAbort();
 }
@@ -322,13 +318,15 @@ void URLLoaderResource::OnPluginMsgUpdateProgress(
   bytes_received_ = bytes_received;
   total_bytes_to_be_received_ = total_bytes_to_be_received;
 
-  if (status_callback_)
+  if (status_callback_) {
     status_callback_(pp_instance(), pp_resource(),
                      bytes_sent_, total_bytes_to_be_sent_,
                      bytes_received_, total_bytes_to_be_received_);
+  }
 }
 
 void URLLoaderResource::SetDefersLoading(bool defers_loading) {
+  is_asynchronous_load_suspended_ = defers_loading;
   Post(RENDERER, PpapiHostMsg_URLLoader_SetDeferLoading(defers_loading));
 }