Improve Ganesh helpers.

mojo/skia/ganesh_framebuffer_surface.h

Index: mojo/skia/ganesh_framebuffer_surface.h
diff --git a/mojo/skia/ganesh_framebuffer_surface.h b/mojo/skia/ganesh_framebuffer_surface.h
index 6925b037203bec0017390b2f3fb91b60d756e87c..99ab14971000f97afd52421fe7610cf6a85b3ff0 100644
--- a/mojo/skia/ganesh_framebuffer_surface.h
+++ b/mojo/skia/ganesh_framebuffer_surface.h
@@ -5,14 +5,13 @@
 #ifndef MOJO_SKIA_GANESH_FRAMEBUFFER_SURFACE_H_
 #define MOJO_SKIA_GANESH_FRAMEBUFFER_SURFACE_H_
 
-#include <memory>
-
-#include "mojo/gpu/gl_texture.h"
+#include "base/macros.h"
 #include "mojo/skia/ganesh_context.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkSurface.h"
 
 namespace mojo {
+namespace skia {
 
 // This class represents an SkSurface backed by a GL framebuffer, which is
 // appropriate for use with Ganesh.  This is useful for rendering Skia
@@ -21,18 +20,19 @@ class GaneshFramebufferSurface {
  public:
   // Creates a surface that wraps the currently bound GL framebuffer.
   // The size of the surface is determined by querying the current viewport.
-  explicit GaneshFramebufferSurface(GaneshContext* context);
+  explicit GaneshFramebufferSurface(const GaneshContext::Scope& scope);
   ~GaneshFramebufferSurface();
 
   SkSurface* surface() const { return surface_.get(); }
   SkCanvas* canvas() const { return surface_->getCanvas(); }
 
  private:
-  skia::RefPtr<SkSurface> surface_;
+  ::skia::RefPtr<SkSurface> surface_;
 
   DISALLOW_COPY_AND_ASSIGN(GaneshFramebufferSurface);
 };
 
+}  // namespace skia
 }  // namespace mojo
 
 #endif  // MOJO_SKIA_GANESH_FRAMEBUFFER_SURFACE_H_