Update the nine patch layer to use UI resources

cc/resources/scoped_ui_resource.h

Index: cc/resources/scoped_ui_resource.h
diff --git a/cc/resources/scoped_ui_resource.h b/cc/resources/scoped_ui_resource.h
index 628d372c552f2707965b2011731dc3db4b0cc141..b14627c41401b059f08dd3f4581c338642de2950 100644
--- a/cc/resources/scoped_ui_resource.h
+++ b/cc/resources/scoped_ui_resource.h
@@ -7,6 +7,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "cc/base/cc_export.h"
+#include "cc/resources/ui_resource.h"
 #include "cc/resources/ui_resource_bitmap.h"
 #include "cc/resources/ui_resource_client.h"
 #include "ui/gfx/size.h"
@@ -15,17 +16,20 @@ namespace cc {
 
 class LayerTreeHost;
 
-class CC_EXPORT ScopedUIResource : public UIResourceClient {
+class CC_EXPORT ScopedUIResource : public UIResourceClient, public UIResource {

[danakj, 2013/08/27 15:42:48]

Can you add a comment explaining what this class is?

[powei, 2013/08/27 22:39:28]

Done.

  public:
   static scoped_ptr<ScopedUIResource> Create(
       LayerTreeHost* host,
       scoped_refptr<UIResourceBitmap> bitmap);
   virtual ~ScopedUIResource();
 
+  // UIResourceClient

[danakj, 2013/08/27 15:42:48]

// UIResourceClient implementation.

[powei, 2013/08/27 22:39:28]

Done.

   virtual scoped_refptr<UIResourceBitmap> GetBitmap(
       UIResourceId uid,
       bool resource_lost) OVERRIDE;
-  UIResourceId id() { return id_; }
+

[danakj, 2013/08/27 15:42:48]

// UIResource implementation.

[powei, 2013/08/27 22:39:28]

Done.

+  // UIResource
+  virtual UIResourceId id() OVERRIDE;
 
  protected:
   ScopedUIResource(LayerTreeHost* host, scoped_refptr<UIResourceBitmap> bitmap);