Update the nine patch layer to use UI resources

cc/resources/scoped_ui_resource.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_RESOURCES_SCOPED_UI_RESOURCE_H_
 #define CC_RESOURCES_SCOPED_UI_RESOURCE_H_
 
 #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"
 
 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);
 
   // An empty default contructor for testing.
   ScopedUIResource();
 
   scoped_refptr<UIResourceBitmap> bitmap_;
   LayerTreeHost* host_;
   UIResourceId id_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedUIResource);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_SCOPED_UI_RESOURCE_H_