Get mojo_shell building inside chromium checkout.

mojo/services/surfaces/context_provider_mojo.h

Index: mojo/services/surfaces/context_provider_mojo.h
diff --git a/mojo/cc/context_provider_mojo.h b/mojo/services/surfaces/context_provider_mojo.h
similarity index 82%
copy from mojo/cc/context_provider_mojo.h
copy to mojo/services/surfaces/context_provider_mojo.h
index f206fc2cd6f4d93e64e7ffb1385d6d342a98ffb3..48d12f22592b3757a5d14ca71b95d5e96a045633 100644
--- a/mojo/cc/context_provider_mojo.h
+++ b/mojo/services/surfaces/context_provider_mojo.h
@@ -2,15 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_CC_CONTEXT_PROVIDER_MOJO_H_
-#define MOJO_CC_CONTEXT_PROVIDER_MOJO_H_
+#ifndef SERVICES_SURFACES_CONTEXT_PROVIDER_MOJO_H_
+#define SERVICES_SURFACES_CONTEXT_PROVIDER_MOJO_H_
 
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "cc/output/context_provider.h"
-#include "third_party/mojo/src/mojo/public/c/gles2/gles2.h"
-#include "third_party/mojo/src/mojo/public/cpp/system/core.h"
+#include "mojo/public/c/gles2/gles2.h"
+#include "mojo/public/cpp/system/core.h"
 
 namespace mojo {
 
@@ -23,18 +22,18 @@ class ContextProviderMojo : public cc::ContextProvider {
   gpu::gles2::GLES2Interface* ContextGL() override;
   gpu::ContextSupport* ContextSupport() override;
   class GrContext* GrContext() override;
-  void SetupLock() override;
-  base::Lock* GetLock() override;
   Capabilities ContextCapabilities() override;
   bool IsContextLost() override;
   void VerifyContexts() override {}
   void DeleteCachedResources() override {}
   bool DestroyedOnMainThread() override;
   void SetLostContextCallback(
-      const LostContextCallback& lost_context_callback) override {}
+      const LostContextCallback& lost_context_callback) override;
   void SetMemoryPolicyChangedCallback(
       const MemoryPolicyChangedCallback& memory_policy_changed_callback)
       override {}
+  void SetupLock() override;
+  base::Lock* GetLock() override;
 
  protected:
   friend class base::RefCountedThreadSafe<ContextProviderMojo>;
@@ -49,8 +48,8 @@ class ContextProviderMojo : public cc::ContextProvider {
   cc::ContextProvider::Capabilities capabilities_;
   ScopedMessagePipeHandle command_buffer_handle_;
   MojoGLES2Context context_;
-  scoped_ptr<gpu::gles2::GLES2Interface> context_gl_;
   bool context_lost_;
+  LostContextCallback lost_context_callback_;
 
   base::Lock context_lock_;
 
@@ -59,4 +58,4 @@ class ContextProviderMojo : public cc::ContextProvider {
 
 }  // namespace mojo
 
-#endif  // MOJO_CC_CONTEXT_PROVIDER_MOJO_H_
+#endif  // SERVICES_SURFACES_CONTEXT_PROVIDER_MOJO_H_