BASELINE: Update Chromium to 47.0.2526.14

Also adding in sources needed for spellchecking.

Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

6 files changed, 18 insertions, 18 deletions

diff --git a/chromium/content/renderer/devtools/OWNERS b/chromium/content/renderer/devtools/OWNERS
index bb6028e656a..120ed52a028 100644
--- a/chromium/content/renderer/devtools/OWNERS
+++ b/chromium/content/renderer/devtools/OWNERS
@@ -1,2 +1 @@
-pfeldman@chromium.org
 yurys@chromium.org
diff --git a/chromium/content/renderer/devtools/devtools_agent.cc b/chromium/content/renderer/devtools/devtools_agent.cc
index 0777af1c66a..d464b15b941 100644
--- a/chromium/content/renderer/devtools/devtools_agent.cc
+++ b/chromium/content/renderer/devtools/devtools_agent.cc
@@ -45,14 +45,13 @@ class WebKitClientMessageLoopImpl
     : public WebDevToolsAgentClient::WebKitClientMessageLoop {
  public:
   WebKitClientMessageLoopImpl() : message_loop_(base::MessageLoop::current()) {}
-  virtual ~WebKitClientMessageLoopImpl() { message_loop_ = NULL; }
-  virtual void run() {
+  ~WebKitClientMessageLoopImpl() override { message_loop_ = NULL; }
+  void run() override {
     base::MessageLoop::ScopedNestableTaskAllower allow(message_loop_);
     message_loop_->Run();
   }
-  virtual void quitNow() {
-    message_loop_->QuitNow();
-  }
+  void quitNow() override { message_loop_->QuitNow(); }
+
  private:
   base::MessageLoop* message_loop_;
 };
diff --git a/chromium/content/renderer/devtools/devtools_agent_filter.cc b/chromium/content/renderer/devtools/devtools_agent_filter.cc
index 127abb031ed..e1b3af0ba1f 100644
--- a/chromium/content/renderer/devtools/devtools_agent_filter.cc
+++ b/chromium/content/renderer/devtools/devtools_agent_filter.cc
@@ -25,14 +25,15 @@ class MessageImpl : public WebDevToolsAgent::MessageDescriptor {
       : msg_(message),
         routing_id_(routing_id) {
   }
-  virtual ~MessageImpl() {}
-  virtual WebDevToolsAgent* agent() {
+  ~MessageImpl() override {}
+  WebDevToolsAgent* agent() override {
     DevToolsAgent* agent = DevToolsAgent::FromRoutingId(routing_id_);
     if (!agent)
       return 0;
     return agent->GetWebAgent();
   }
-  virtual WebString message() { return WebString::fromUTF8(msg_); }
+  WebString message() override { return WebString::fromUTF8(msg_); }
+
  private:
   std::string msg_;
   int routing_id_;
diff --git a/chromium/content/renderer/devtools/devtools_client.h b/chromium/content/renderer/devtools/devtools_client.h
index 764714c1fe2..205ae1a0d95 100644
--- a/chromium/content/renderer/devtools/devtools_client.h
+++ b/chromium/content/renderer/devtools/devtools_client.h
@@ -31,17 +31,17 @@ class CONTENT_EXPORT DevToolsClient
  public:
   DevToolsClient(RenderFrame* main_render_frame,
                  const std::string& compatibility_script);
-  virtual ~DevToolsClient();
+  ~DevToolsClient() override;
 
  private:
   // RenderFrameObserver overrides.
   void DidClearWindowObject() override;
 
   // WebDevToolsFrontendClient implementation.
-  virtual void sendMessageToBackend(const blink::WebString&) override;
-  virtual void sendMessageToEmbedder(const blink::WebString&) override;
+  void sendMessageToBackend(const blink::WebString&) override;
+  void sendMessageToEmbedder(const blink::WebString&) override;
 
-  virtual bool isUnderTest() override;
+  bool isUnderTest() override;
 
   void OnDispatchOnInspectorFrontend(const std::string& message,
                                      uint32 total_size);
diff --git a/chromium/content/renderer/devtools/v8_sampling_profiler.h b/chromium/content/renderer/devtools/v8_sampling_profiler.h
index 96a50b0745b..2ead2f7888f 100644
--- a/chromium/content/renderer/devtools/v8_sampling_profiler.h
+++ b/chromium/content/renderer/devtools/v8_sampling_profiler.h
@@ -7,7 +7,7 @@
 
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/trace_event/trace_event_impl.h"
+#include "base/trace_event/trace_log.h"
 #include "content/common/content_export.h"
 
 namespace content {
@@ -21,7 +21,7 @@ class CONTENT_EXPORT V8SamplingProfiler final
     : public base::trace_event::TraceLog::EnabledStateObserver {
  public:
   explicit V8SamplingProfiler(bool underTest = false);
-  ~V8SamplingProfiler();
+  ~V8SamplingProfiler() override;
 
   // Implementation of TraceLog::EnabledStateObserver
   void OnTraceLogEnabled() override;
diff --git a/chromium/content/renderer/devtools/v8_sampling_profiler_browsertest.cc b/chromium/content/renderer/devtools/v8_sampling_profiler_browsertest.cc
index aacd305d03f..1703d5d74ed 100644
--- a/chromium/content/renderer/devtools/v8_sampling_profiler_browsertest.cc
+++ b/chromium/content/renderer/devtools/v8_sampling_profiler_browsertest.cc
@@ -4,6 +4,7 @@
 
 #include "base/json/json_reader.h"
 #include "base/run_loop.h"
+#include "base/trace_event/trace_buffer.h"
 #include "base/trace_event/trace_event.h"
 #include "content/public/test/render_view_test.h"
 #include "content/renderer/devtools/v8_sampling_profiler.h"
@@ -30,7 +31,7 @@ class V8SamplingProfilerTest : public RenderViewTest {
     RenderViewTest::TearDown();
   }
 
-  void KickV8() { ExecuteJavaScript("1"); }
+  void KickV8() { ExecuteJavaScriptForTests("1"); }
 
   void SyncFlush(TraceLog* trace_log) {
     base::WaitableEvent flush_complete_event(false, false);
@@ -53,9 +54,9 @@ class V8SamplingProfilerTest : public RenderViewTest {
     trace_buffer_.Finish();
 
     scoped_ptr<Value> root;
-    root.reset(base::JSONReader::DeprecatedRead(
+    root = base::JSONReader::Read(
         json_output_.json_output,
-        base::JSON_PARSE_RFC | base::JSON_DETACHABLE_CHILDREN));
+        base::JSON_PARSE_RFC | base::JSON_DETACHABLE_CHILDREN);
 
     if (!root.get()) {
       LOG(ERROR) << json_output_.json_output;