BASELINE: Update Chromium to 60.0.3112.70

Change-Id: I9911c2280a014d4632f254857876a395d4baed2d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 11 insertions, 12 deletions

diff --git a/chromium/content/public/browser/render_process_host.h b/chromium/content/public/browser/render_process_host.h
index 00b4c8c575d..97595f18ea2 100644
--- a/chromium/content/public/browser/render_process_host.h
+++ b/chromium/content/public/browser/render_process_host.h
@@ -29,8 +29,8 @@ class SharedPersistentMemoryAllocator;
 class TimeDelta;
 }
 
-namespace media {
-class AudioOutputController;
+namespace service_manager {
+class Identity;
 }
 
 namespace content {
@@ -283,6 +283,8 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::Sender,
   virtual void BindInterface(const std::string& interface_name,
                              mojo::ScopedMessagePipeHandle interface_pipe) = 0;
 
+  virtual const service_manager::Identity& GetChildIdentity() const = 0;
+
   // Extracts any persistent-memory-allocator used for renderer metrics.
   // Ownership is passed to the caller. To support sharing of histogram data
   // between the Renderer and the Browser, the allocator is created when the
@@ -298,16 +300,6 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::Sender,
   // Note: Do not use! Will disappear after PlzNavitate is completed.
   virtual const base::TimeTicks& GetInitTimeForNavigationMetrics() const = 0;
 
-  // Retrieves the list of AudioOutputController objects associated
-  // with this object and passes it to the callback you specify, on
-  // the same thread on which you called the method.
-  typedef std::list<scoped_refptr<media::AudioOutputController>>
-      AudioOutputControllerList;
-  typedef base::Callback<void(const AudioOutputControllerList&)>
-      GetAudioOutputControllersCallback;
-  virtual void GetAudioOutputControllers(
-      const GetAudioOutputControllersCallback& callback) const = 0;
-
   // Returns true if this process currently has backgrounded priority.
   virtual bool IsProcessBackgrounded() const = 0;
 
@@ -364,6 +356,13 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::Sender,
   // any RenderViewHosts that are swapped out.
   size_t GetActiveViewCount();
 
+  // Posts |task|, if this RenderProcessHost is ready or when it becomes ready
+  // (see RenderProcessHost::IsReady method).  The |task| might not run at all
+  // (e.g. if |render_process_host| is destroyed before becoming ready).  This
+  // function can only be called on the browser's UI thread (and the |task| will
+  // be posted back on the UI thread).
+  void PostTaskWhenProcessIsReady(base::OnceClosure task);
+
   // Static management functions -----------------------------------------------
 
   // Flag to run the renderer in process.  This is primarily