Modify DataPacks so they can return RefCountedStaticMemory objects.

app/resource_bundle_mac.mm

 // Copyright (c) 2006-2008 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.
 
 #include "app/resource_bundle.h"
 
 #import <Foundation/Foundation.h>
 
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
@@ skipping 57 matching lines @@
 void ResourceBundle::LoadThemeResources() {
   DCHECK(theme_data_ == NULL) << "theme data already loaded!";
   theme_data_ = LoadResourceDataPack(@"theme");
   DCHECK(theme_data_) << "failed to load theme.pak";
 }
 
 // static
 RefCountedStaticMemory* ResourceBundle::LoadResourceBytes(
     DataHandle module, int resource_id) {
   DCHECK(module);
-  base::StringPiece bytes;
-  if (!module->Get(resource_id, &bytes))
-    return NULL;
-
-  return new RefCountedStaticMemory(
-      reinterpret_cast<const unsigned char*>(bytes.data()), bytes.length());
+  return module->GetStaticMemory(resource_id);
 }
 
 base::StringPiece ResourceBundle::GetRawDataResource(int resource_id) {
   DCHECK(resources_data_);
   base::StringPiece data;
-  if (!resources_data_->Get(resource_id, &data))
+  if (!resources_data_->GetStringPiece(resource_id, &data))
     return base::StringPiece();
   return data;
 }
 
 string16 ResourceBundle::GetLocalizedString(int message_id) {
   // If for some reason we were unable to load a resource dll, return an empty
   // string (better than crashing).
   if (!locale_resources_data_) {
     LOG(WARNING) << "locale resources are not loaded";
     return string16();
   }
 
   base::StringPiece data;
-  if (!locale_resources_data_->Get(message_id, &data)) {
+  if (!locale_resources_data_->GetStringPiece(message_id, &data)) {
     // Fall back on the main data pack (shouldn't be any strings here except in
     // unittests).
     data = GetRawDataResource(message_id);
     if (data.empty()) {
       NOTREACHED() << "unable to find resource: " << message_id;
       return string16();
     }
   }
 
   // Data pack encodes strings as UTF16.
   string16 msg(reinterpret_cast<const char16*>(data.data()),
                data.length() / 2);
   return msg;
 }
 
 NSImage* ResourceBundle::GetNSImageNamed(int resource_id) {
   // Currently this doesn't make a cache holding these as NSImages because
   // GetBitmapNamed has a cache, and we don't want to double cache.
   SkBitmap* bitmap = GetBitmapNamed(resource_id);
   if (!bitmap)
     return nil;
 
   NSImage* nsimage = gfx::SkBitmapToNSImage(*bitmap);
   return nsimage;
 }