Make the net resource interface use StringPiece instead of std::string. This...

webkit/tools/test_shell/test_shell_main.cc

 // 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.
 
 // Creates an instance of the test_shell.
 #include "build/build_config.h"
 
 #include <stdlib.h>  // required by _set_abort_behavior
 
 #if defined(OS_WIN)
@@ skipping 13 matching lines @@
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/icu_util.h"
 #include "base/memory_debug.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/rand_util.h"
 #include "base/stats_table.h"
+#include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/trace_event.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/net_module.h"
 #include "net/http/http_cache.h"
 #include "net/url_request/url_request_context.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/window_open_disposition.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_shell.h"
 #include "webkit/tools/test_shell/test_shell_request_context.h"
 #include "webkit/tools/test_shell/test_shell_switches.h"
 
 #include <iostream>
 using namespace std;
 
 static const size_t kPathBufSize = 2048;
 
 namespace {
 
 // StatsTable initialization parameters.
 static const wchar_t* kStatsFilePrefix = L"testshell_";
 static int kStatsFileThreads = 20;
 static int kStatsFileCounters = 200;
 
 #if defined(OS_WIN)
-std::string GetDataResource(HMODULE module, int resource_id) {
+StringPiece GetRawDataResource(HMODULE module, int resource_id) {
   void* data_ptr;
   size_t data_size;
   return base::GetDataResourceFromModule(module, resource_id, &data_ptr,
                                          &data_size) ?
-      std::string(static_cast<char*>(data_ptr), data_size) : std::string();
+      StringPiece(static_cast<char*>(data_ptr), data_size) : StringPiece();
 }
 
 // This is called indirectly by the network layer to access resources.
-std::string NetResourceProvider(int key) {
-  return GetDataResource(::GetModuleHandle(NULL), key);
+StringPiece NetResourceProvider(int key) {
+  return GetRawDataResource(::GetModuleHandle(NULL), key);
 }
 #endif
 
 }  // namespace
 
 
 int main(int argc, char* argv[]) {
   base::EnableTerminationOnHeapCorruption();
 #ifdef _CRTDBG_MAP_ALLOC
   _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
@@ skipping 242 matching lines @@
 
   // Tear down shared StatsTable; prevents unit_tests from leaking it.
   StatsTable::set_current(NULL);
   delete table;
 
 #ifdef _CRTDBG_MAP_ALLOC
   _CrtDumpMemoryLeaks();
 #endif
   return 0;
 }