Revert 223162 "Update the nine patch layer to use UI resources"

trunk/src/cc/layers/scrollbar_layer_unittest.cc

Index: trunk/src/cc/layers/scrollbar_layer_unittest.cc
===================================================================
--- trunk/src/cc/layers/scrollbar_layer_unittest.cc	(revision 223178)
+++ trunk/src/cc/layers/scrollbar_layer_unittest.cc	(working copy)
@@ -527,8 +527,7 @@
   virtual UIResourceId CreateUIResource(UIResourceClient* content) OVERRIDE {
     total_ui_resource_created_++;
     UIResourceId nid = next_id_++;
-    ui_resource_bitmap_map_.insert(
-        std::make_pair(nid, content->GetBitmap(nid, false)));
+    ui_resource_bitmap_map_[nid] = content->GetBitmap(nid, false);
     return nid;
   }
 
@@ -547,13 +546,13 @@
 
   gfx::Size ui_resource_size(UIResourceId id) {
     UIResourceBitmapMap::iterator iter = ui_resource_bitmap_map_.find(id);
-    if (iter != ui_resource_bitmap_map_.end())
-      return iter->second.GetSize();
+    if (iter != ui_resource_bitmap_map_.end() && iter->second.get())
+      return iter->second->GetSize();
     return gfx::Size();
   }
 
  private:
-  typedef base::hash_map<UIResourceId, UIResourceBitmap>
+  typedef base::hash_map<UIResourceId, scoped_refptr<UIResourceBitmap> >
       UIResourceBitmapMap;
   UIResourceBitmapMap ui_resource_bitmap_map_;