Modify DataPacks so they can return RefCountedStaticMemory objects.

(This is in preparation for a very large reworking of BrowserThemeProvider).

BUG=http://crbug.com/21121

Review URL: http://codereview.chromium.org/338027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30241 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 6 deletions

diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index 433f191..e968b08 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -185,7 +185,7 @@ void TestShell::InitializeTestShell(bool layout_test_mode) {
   // fontconfig only knows how to load font config configs from a file name, so
   // we write to a temp file.
   base::StringPiece font_config_xml;
-  g_resource_data_pack->Get(IDR_LINUX_FONT_CONFIG, &font_config_xml);
+  g_resource_data_pack->GetStringPiece(IDR_LINUX_FONT_CONFIG, &font_config_xml);
   FilePath fontconfig_path;
   if (!file_util::CreateTemporaryFile(&fontconfig_path)) {
     LOG(FATAL) << "failed to create temp font config file";
@@ -274,7 +274,7 @@ void TestShell::InitializeTestShell(bool layout_test_mode) {
 
   // Also load the layout-test-specific "Ahem" font.
   base::StringPiece ahem_font;
-  g_resource_data_pack->Get(IDR_AHEM_FONT, &ahem_font);
+  g_resource_data_pack->GetStringPiece(IDR_AHEM_FONT, &ahem_font);
   g_ahem_path = new FilePath;
   if (!file_util::CreateTemporaryFile(g_ahem_path)) {
     LOG(FATAL) << "failed to create temp ahem font";
@@ -637,7 +637,7 @@ void TestShell::ShowStartupDebuggingDialog() {
 // static
 base::StringPiece TestShell::NetResourceProvider(int key) {
   base::StringPiece res;
-  g_resource_data_pack->Get(key, &res);
+  g_resource_data_pack->GetStringPiece(key, &res);
   return res;
 }
 
@@ -647,7 +647,7 @@ namespace webkit_glue {
 
 string16 GetLocalizedString(int message_id) {
   base::StringPiece res;
-  if (!g_resource_data_pack->Get(message_id, &res)) {
+  if (!g_resource_data_pack->GetStringPiece(message_id, &res)) {
     LOG(FATAL) << "failed to load webkit string with id " << message_id;
   }
 
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index 2214ef3..fb30636 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -635,7 +635,7 @@ void TestShell::ShowStartupDebuggingDialog() {
 
 base::StringPiece TestShell::NetResourceProvider(int key) {
   base::StringPiece res;
-  g_resource_data_pack->Get(key, &res);
+  g_resource_data_pack->GetStringPiece(key, &res);
   return res;
 }
 
@@ -645,7 +645,7 @@ namespace webkit_glue {
 
 string16 GetLocalizedString(int message_id) {
   base::StringPiece res;
-  if (!g_resource_data_pack->Get(message_id, &res)) {
+  if (!g_resource_data_pack->GetStringPiece(message_id, &res)) {
     LOG(FATAL) << "failed to load webkit string with id " << message_id;
   }