From 3ec2270eb25e6828a0c8565af3000a5352c7dab8 Mon Sep 17 00:00:00 2001
From: Etienne Membrives <etiennej@chromium.org>
Date: Thu, 19 Feb 2015 17:27:12 +0100
Subject: [PATCH] Update from https://crrev.com/316786

List of manually-modified files:
gpu/command_buffer/service/in_process_command_buffer.cc
examples/sample_app/BUILD.gn
examples/sample_app/spinning_cube.cc
mojo/android/javatests/src/org/chromium/mojo/MojoTestCase.java
mojo/cc/context_provider_mojo.cc
mojo/cc/context_provider_mojo.h
mojo/common/trace_controller_impl.cc
mojo/gles2/command_buffer_client_impl.cc
mojo/gles2/command_buffer_client_impl.h
services/gles2/gpu_impl.cc
shell/android/apk/src/org/chromium/mojo/shell/MojoShellApplication.java
sky/engine/core/dom/Node.cpp
sky/shell/apk/src/org/domokit/sky/shell/SkyShellApplication.java
ui/events/latency_info.cc
ui/gfx/transform.cc
ui/gfx/transform.h
ui/gfx/transform_util.cc
ui/gfx/transform_util.h

Review URL: https://codereview.chromium.org/935333002
---
 engine/core/dom/Node.cpp                                     | 2 +-
 shell/apk/src/org/domokit/sky/shell/SkyShellApplication.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/engine/core/dom/Node.cpp b/engine/core/dom/Node.cpp
index 60f5fe971ed..473ae8e5a2e 100644
--- a/engine/core/dom/Node.cpp
+++ b/engine/core/dom/Node.cpp
@@ -533,7 +533,7 @@ void Node::markAncestorsWithChildNeedsDistributionRecalc()
 
 namespace {
 
-class JSONTraceValue : public base::debug::ConvertableToTraceFormat {
+class JSONTraceValue : public base::trace_event::ConvertableToTraceFormat {
 public:
     explicit JSONTraceValue(RefPtr<JSONValue> value)
         : m_value(value.release()) { }
diff --git a/shell/apk/src/org/domokit/sky/shell/SkyShellApplication.java b/shell/apk/src/org/domokit/sky/shell/SkyShellApplication.java
index efb12ddc9cf..d60ce5f5f54 100644
--- a/shell/apk/src/org/domokit/sky/shell/SkyShellApplication.java
+++ b/shell/apk/src/org/domokit/sky/shell/SkyShellApplication.java
@@ -10,6 +10,7 @@ import org.chromium.base.BaseChromiumApplication;
 import org.chromium.base.PathUtils;
 import org.chromium.base.ResourceExtractor;
 import org.chromium.base.library_loader.LibraryLoader;
+import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.library_loader.ProcessInitException;
 
 /**
@@ -43,7 +44,7 @@ public class SkyShellApplication extends BaseChromiumApplication {
      */
     private void initializeNative() {
         try {
-            LibraryLoader.ensureInitialized();
+            LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER).ensureInitialized();
         } catch (ProcessInitException e) {
             Log.e(TAG, "sky_shell initialization failed.", e);
             throw new RuntimeException(e);