Update Chromium to beta version 37.0.2062.68

Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

5 files changed, 41 insertions, 21 deletions

diff --git a/chromium/components/tracing/BUILD.gn b/chromium/components/tracing/BUILD.gn
new file mode 100644
index 00000000000..c2e05190ad6
--- /dev/null
+++ b/chromium/components/tracing/BUILD.gn
@@ -0,0 +1,17 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("tracing") {
+  sources = [
+    "child_trace_message_filter.cc",
+    "child_trace_message_filter.h",
+    "tracing_messages.cc",
+    "tracing_messages.h",
+  ]
+
+  deps = [
+    "//base",
+    "//ipc",
+  ]
+}
diff --git a/chromium/components/tracing/DEPS b/chromium/components/tracing/DEPS
index bd05a3eaf55..9634ba4f06a 100644
--- a/chromium/components/tracing/DEPS
+++ b/chromium/components/tracing/DEPS
@@ -1,8 +1,4 @@
 include_rules = [
   "+base",
   "+ipc",
-
-  # This component will be compiled into NaCl, so it shouldn't depend on
-  # anything in content.
-  "-content",
 ]
diff --git a/chromium/components/tracing/OWNERS b/chromium/components/tracing/OWNERS
index b4ae91e8e90..7fb13eeeff4 100644
--- a/chromium/components/tracing/OWNERS
+++ b/chromium/components/tracing/OWNERS
@@ -4,8 +4,12 @@ nduca@chromium.org
 # Changes to IPC messages require a security review to avoid introducing
 # new sandbox escapes.
 per-file *_messages*.h=set noparent
-per-file *_messages*.h=cdn@chromium.org
 per-file *_messages*.h=cevans@chromium.org
+per-file *_messages*.h=dcheng@chromium.org
+per-file *_messages*.h=inferno@chromium.org
 per-file *_messages*.h=jln@chromium.org
 per-file *_messages*.h=jschuh@chromium.org
+per-file *_messages*.h=kenrb@chromium.org
+per-file *_messages*.h=nasko@chromium.org
+per-file *_messages*.h=palmer@chromium.org
 per-file *_messages*.h=tsepez@chromium.org
diff --git a/chromium/components/tracing/child_trace_message_filter.cc b/chromium/components/tracing/child_trace_message_filter.cc
index d3875c7fa04..3df0f7075fc 100644
--- a/chromium/components/tracing/child_trace_message_filter.cc
+++ b/chromium/components/tracing/child_trace_message_filter.cc
@@ -7,6 +7,7 @@
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "components/tracing/tracing_messages.h"
+#include "ipc/ipc_channel.h"
 
 using base::debug::TraceLog;
 
@@ -14,16 +15,16 @@ namespace tracing {
 
 ChildTraceMessageFilter::ChildTraceMessageFilter(
     base::MessageLoopProxy* ipc_message_loop)
-    : channel_(NULL),
+    : sender_(NULL),
       ipc_message_loop_(ipc_message_loop) {}
 
-void ChildTraceMessageFilter::OnFilterAdded(IPC::Channel* channel) {
-  channel_ = channel;
-  channel_->Send(new TracingHostMsg_ChildSupportsTracing());
+void ChildTraceMessageFilter::OnFilterAdded(IPC::Sender* sender) {
+  sender_ = sender;
+  sender_->Send(new TracingHostMsg_ChildSupportsTracing());
 }
 
 void ChildTraceMessageFilter::OnFilterRemoved() {
-  channel_ = NULL;
+  sender_ = NULL;
 }
 
 bool ChildTraceMessageFilter::OnMessageReceived(const IPC::Message& message) {
@@ -61,6 +62,7 @@ void ChildTraceMessageFilter::OnBeginTracing(
 
   TraceLog::GetInstance()->SetEnabled(
       base::debug::CategoryFilter(category_filter_str),
+      base::debug::TraceLog::RECORDING_MODE,
       static_cast<base::debug::TraceLog::Options>(options));
 }
 
@@ -81,6 +83,7 @@ void ChildTraceMessageFilter::OnEnableMonitoring(
     int options) {
   TraceLog::GetInstance()->SetEnabled(
       base::debug::CategoryFilter(category_filter_str),
+      base::debug::TraceLog::MONITORING_MODE,
       static_cast<base::debug::TraceLog::Options>(options));
 }
 
@@ -102,7 +105,7 @@ void ChildTraceMessageFilter::OnCaptureMonitoringSnapshot() {
 void ChildTraceMessageFilter::OnGetTraceBufferPercentFull() {
   float bpf = TraceLog::GetInstance()->GetBufferPercentFull();
 
-  channel_->Send(new TracingHostMsg_TraceBufferPercentFullReply(bpf));
+  sender_->Send(new TracingHostMsg_TraceBufferPercentFullReply(bpf));
 }
 
 void ChildTraceMessageFilter::OnSetWatchEvent(const std::string& category_name,
@@ -122,7 +125,7 @@ void ChildTraceMessageFilter::OnWatchEventMatched() {
         base::Bind(&ChildTraceMessageFilter::OnWatchEventMatched, this));
     return;
   }
-  channel_->Send(new TracingHostMsg_WatchEventMatched);
+  sender_->Send(new TracingHostMsg_WatchEventMatched);
 }
 
 void ChildTraceMessageFilter::OnTraceDataCollected(
@@ -135,13 +138,13 @@ void ChildTraceMessageFilter::OnTraceDataCollected(
     return;
   }
   if (events_str_ptr->data().size()) {
-    channel_->Send(new TracingHostMsg_TraceDataCollected(
+    sender_->Send(new TracingHostMsg_TraceDataCollected(
         events_str_ptr->data()));
   }
   if (!has_more_events) {
     std::vector<std::string> category_groups;
     TraceLog::GetInstance()->GetKnownCategoryGroups(&category_groups);
-    channel_->Send(new TracingHostMsg_EndTracingAck(category_groups));
+    sender_->Send(new TracingHostMsg_EndTracingAck(category_groups));
   }
 }
 
@@ -157,11 +160,11 @@ void ChildTraceMessageFilter::OnMonitoringTraceDataCollected(
                    has_more_events));
     return;
   }
-  channel_->Send(new TracingHostMsg_MonitoringTraceDataCollected(
+  sender_->Send(new TracingHostMsg_MonitoringTraceDataCollected(
       events_str_ptr->data()));
 
   if (!has_more_events)
-    channel_->Send(new TracingHostMsg_CaptureMonitoringSnapshotAck());
+    sender_->Send(new TracingHostMsg_CaptureMonitoringSnapshotAck());
 }
 
 }  // namespace tracing
diff --git a/chromium/components/tracing/child_trace_message_filter.h b/chromium/components/tracing/child_trace_message_filter.h
index d2aae3b5257..5bd993e80e4 100644
--- a/chromium/components/tracing/child_trace_message_filter.h
+++ b/chromium/components/tracing/child_trace_message_filter.h
@@ -7,7 +7,7 @@
 
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
-#include "ipc/ipc_channel_proxy.h"
+#include "ipc/message_filter.h"
 
 namespace base {
 class MessageLoopProxy;
@@ -16,12 +16,12 @@ class MessageLoopProxy;
 namespace tracing {
 
 // This class sends and receives trace messages on child processes.
-class ChildTraceMessageFilter : public IPC::ChannelProxy::MessageFilter {
+class ChildTraceMessageFilter : public IPC::MessageFilter {
  public:
   explicit ChildTraceMessageFilter(base::MessageLoopProxy* ipc_message_loop);
 
-  // IPC::ChannelProxy::MessageFilter implementation.
-  virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE;
+  // IPC::MessageFilter implementation.
+  virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE;
   virtual void OnFilterRemoved() OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
@@ -54,7 +54,7 @@ class ChildTraceMessageFilter : public IPC::ChannelProxy::MessageFilter {
       const scoped_refptr<base::RefCountedString>& events_str_ptr,
       bool has_more_events);
 
-  IPC::Channel* channel_;
+  IPC::Sender* sender_;
   base::MessageLoopProxy* ipc_message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildTraceMessageFilter);