summaryrefslogtreecommitdiffstats
path: root/net/base/registry_controlled_domain.cc
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-20 00:38:38 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-20 00:38:38 +0000
commitd4eafbf25ee2e43dbcee80ccb55a3e5c153dd189 (patch)
treebe8be064771dac45ef5f9d9c26bdead102e3d2b8 /net/base/registry_controlled_domain.cc
parent2dea04cdfc632bfe29d7ffb436827ea2726ec092 (diff)
downloadchromium_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/registry_controlled_domain.cc')
-rw-r--r--net/base/registry_controlled_domain.cc2
1 files changed, 1 insertions, 1 deletions
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.