Update mojo sdk to rev cbf8d2ee9b7d07c7751d8d861f3b7e2bd9829b05

BUG=None
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/1309323002

Cr-Commit-Position: refs/heads/master@{#345927}

5 files changed, 21 insertions, 42 deletions

diff --git a/mojo/application/public/cpp/lib/application_impl.cc b/mojo/application/public/cpp/lib/application_impl.cc
index 6279703..7885e50 100644
--- a/mojo/application/public/cpp/lib/application_impl.cc
+++ b/mojo/application/public/cpp/lib/application_impl.cc
@@ -25,19 +25,6 @@ void DefaultTerminationClosure() {
 
 }  // namespace
 
-// TODO(beng): upstream this into mojo repo, array.h
-template <typename E, typename T>
-struct TypeConverter<std::set<E>, Array<T>> {
-  static std::set<E> Convert(const Array<T>& input) {
-    std::set<E> result;
-    if (!input.is_null()) {
-      for (size_t i = 0; i < input.size(); ++i)
-        result.insert(TypeConverter<E, T>::Convert(input[i]));
-    }
-    return result;
-  }
-};
-
 ApplicationImpl::ApplicationImpl(ApplicationDelegate* delegate,
                                  InterfaceRequest<Application> request)
     : ApplicationImpl(delegate, request.Pass(),
diff --git a/mojo/cc/BUILD.gn b/mojo/cc/BUILD.gn
index c35180f..5e7e964 100644
--- a/mojo/cc/BUILD.gn
+++ b/mojo/cc/BUILD.gn
@@ -13,6 +13,7 @@ source_set("cc") {
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/command_buffer/client:gles2_interface",
     "//mojo/converters/surfaces",
+    "//mojo/gles2:headers",
     "//mojo/gpu:mojo_gles2_implementation",
     "//skia",
     "//third_party/mojo/src/mojo/public/c/gles2",
diff --git a/mojo/cc/context_provider_mojo.cc b/mojo/cc/context_provider_mojo.cc
index 5b0a640..801d9f5 100644
--- a/mojo/cc/context_provider_mojo.cc
+++ b/mojo/cc/context_provider_mojo.cc
@@ -5,6 +5,7 @@
 #include "mojo/cc/context_provider_mojo.h"
 
 #include "base/logging.h"
+#include "mojo/gles2/gles2_context.h"
 #include "mojo/gpu/mojo_gles2_impl_autogen.h"
 #include "third_party/mojo/src/mojo/public/cpp/environment/environment.h"
 
@@ -36,8 +37,8 @@ gpu::gles2::GLES2Interface* ContextProviderMojo::ContextGL() {
 gpu::ContextSupport* ContextProviderMojo::ContextSupport() {
   if (!context_)
     return NULL;
-  return static_cast<gpu::ContextSupport*>(
-      MojoGLES2GetContextSupport(context_));
+  // TODO(rjkroege): Ensure that UIP does not take this code path.
+  return static_cast<gles2::GLES2Context*>(context_)->context_support();
 }
 
 class GrContext* ContextProviderMojo::GrContext() { return NULL; }
diff --git a/mojo/gles2/BUILD.gn b/mojo/gles2/BUILD.gn
index 5ec3289..85f4ca6 100644
--- a/mojo/gles2/BUILD.gn
+++ b/mojo/gles2/BUILD.gn
@@ -10,6 +10,23 @@ config("gles2_use_mojo") {
   defines = [ "GLES2_USE_MOJO" ]
 }
 
+source_set("headers") {
+  sources = [
+    "command_buffer_client_impl.h",
+    "gles2_context.h",
+  ]
+
+  public_deps = [
+    "//base",
+    "//components/view_manager/public/interfaces",
+    "//gpu/command_buffer/client",
+    "//gpu/command_buffer/client:gles2_implementation",
+    "//gpu/command_buffer/common",
+    "//third_party/mojo/src/mojo/public/c/gles2:headers",
+    "//third_party/mojo/src/mojo/public/cpp/bindings",
+  ]
+}
+
 source_set("gles2") {
   sources = [
     "command_buffer_client_impl.cc",
diff --git a/mojo/shell/capability_filter.h b/mojo/shell/capability_filter.h
index 6d17cc3..16a55c2 100644
--- a/mojo/shell/capability_filter.h
+++ b/mojo/shell/capability_filter.h
@@ -11,33 +11,6 @@
 #include "mojo/public/cpp/bindings/array.h"
 
 namespace mojo {
-// TODO(beng): upstream this into mojo repo, array.h so it can be shared with
-//             application_impl.cc.
-// A |TypeConverter| that will create an |std::set<E>| containing a copy of
-// the contents of an |Array<T>|, using |TypeConverter<E, T>| to copy each
-// element. If the input array is null, the output set will be empty.
-template <typename E, typename T>
-struct TypeConverter <std::set<E>, Array<T>> {
-  static std::set<E> Convert(const Array<T>& input) {
-    std::set<E> result;
-    if (!input.is_null()) {
-      for (size_t i = 0; i < input.size(); ++i)
-        result.insert(TypeConverter<E, T>::Convert(input[i]));
-    }
-    return result;
-  }
-};
-
-template <typename T, typename E>
-struct TypeConverter <Array<T>, std::set<E>> {
-  static Array<T> Convert(const std::set<E>& input) {
-    Array<T> result(0u);
-    for (auto i : input)
-      result.push_back(TypeConverter<T, E>::Convert(i));
-    return result.Pass();
-  }
-};
-
 namespace shell {
 
 // A set of names of interfaces that may be exposed to an application.