diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-20 00:38:38 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-20 00:38:38 +0000 |
| commit | d4eafbf25ee2e43dbcee80ccb55a3e5c153dd189 (patch) | |
| tree | be8be064771dac45ef5f9d9c26bdead102e3d2b8 /net/base/net_module.cc | |
| parent | 2dea04cdfc632bfe29d7ffb436827ea2726ec092 (diff) | |
| download | chromium_src-d4eafbf25ee2e43dbcee80ccb55a3e5c153dd189.zip chromium_src-d4eafbf25ee2e43dbcee80ccb55a3e5c153dd189.tar.gz chromium_src-d4eafbf25ee2e43dbcee80ccb55a3e5c153dd189.tar.bz2 | |
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
Diffstat (limited to 'net/base/net_module.cc')
| -rw-r--r-- | net/base/net_module.cc | 4 |
1 files changed, 2 insertions, 2 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 |