Revert "Make the net resource interface use StringPiece instead of

std::string.  This means we can point directly into the resource in the
binary, instead of copying.  This makes sense for the TLD data, which doesn't
need to be copied around."

This reverts commit r5735.

TBR=deanm

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


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

4 files changed, 7 insertions, 9 deletions

diff --git a/net/base/net_module.cc b/net/base/net_module.cc
index 7c3f9c1..d54a0a4 100644
--- a/net/base/net_module.cc
+++ b/net/base/net_module.cc
@@ -14,10 +14,10 @@ void NetModule::SetResourceProvider(ResourceProvider func) {
 }
 
 // static
-StringPiece NetModule::GetResource(int key) {
+std::string NetModule::GetResource(int key) {
   // avoid thread safety issues by copying provider address to a local var
   ResourceProvider func = resource_provider;
-  return func ? func(key) : StringPiece();
+  return func ? func(key) : std::string();
 }
 
 }  // namespace net
diff --git a/net/base/net_module.h b/net/base/net_module.h
index e527b9f..ef309ff 100644
--- a/net/base/net_module.h
+++ b/net/base/net_module.h
@@ -8,7 +8,6 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/string_piece.h"
 
 namespace net {
 
@@ -21,7 +20,7 @@ namespace net {
 //
 class NetModule {
  public:
-  typedef StringPiece (*ResourceProvider)(int key);
+  typedef std::string (*ResourceProvider)(int key);
 
   // Set the function to call when the net module needs resources
   static void SetResourceProvider(ResourceProvider func);
@@ -29,7 +28,7 @@ class NetModule {
   // Call the resource provider (if one exists) to get the specified resource.
   // Returns an empty string if the resource does not exist or if there is no
   // resource provider.
-  static StringPiece GetResource(int key);
+  static std::string GetResource(int key);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(NetModule);
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index 1617d85..05419fb 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -800,12 +800,11 @@ std::string CanonicalizeHost(const std::wstring& host, bool* is_ip_address) {
   
 #ifdef OS_WIN
 std::string GetDirectoryListingHeader(const std::string& title) {
-  static const StringPiece header(NetModule::GetResource(IDR_DIR_HEADER_HTML));
-  if (header.empty()) {
+  std::string result = NetModule::GetResource(IDR_DIR_HEADER_HTML);
+  if (result.empty()) {
     NOTREACHED() << "expected resource not found";
   }
 
-  std::string result(header.data(), header.size());
   result.append("<script>start(");
   string_escape::JavascriptDoubleQuote(title, true, &result);
   result.append(");</script>\n");
diff --git a/net/base/registry_controlled_domain.cc b/net/base/registry_controlled_domain.cc
index f98a3f3..3f4f024 100644
--- a/net/base/registry_controlled_domain.cc
+++ b/net/base/registry_controlled_domain.cc
@@ -296,7 +296,7 @@ void RegistryControlledDomainService::UseDomainData(const std::string& data) {
 }
 
 void RegistryControlledDomainService::Init() {
-  domain_data_ = NetModule::GetResource(IDR_EFFECTIVE_TLD_NAMES).as_string();
+  domain_data_ = NetModule::GetResource(IDR_EFFECTIVE_TLD_NAMES);
   if (domain_data_.empty()) {
     // The resource file isn't present for some unit tests, for example.  Fall
     // back to a tiny, basic list of rules in that case.