From 8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee Mon Sep 17 00:00:00 2001 From: "tony@chromium.org" Date: Thu, 10 Sep 2009 21:08:39 +0000 Subject: Move StringPiece into the base namespace. It is colliding with the StringPiece class in icu4.2, which is a problem when trying to use the system version of icu. Review URL: http://codereview.chromium.org/193072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25920 0039d316-1c4b-4281-b951-d872f2087c98 --- net/base/net_module.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'net/base/net_module.cc') diff --git a/net/base/net_module.cc b/net/base/net_module.cc index de9a586..d7f1918 100644 --- a/net/base/net_module.cc +++ b/net/base/net_module.cc @@ -14,8 +14,8 @@ void NetModule::SetResourceProvider(ResourceProvider func) { } // static -StringPiece NetModule::GetResource(int key) { - return resource_provider ? resource_provider(key) : StringPiece(); +base::StringPiece NetModule::GetResource(int key) { + return resource_provider ? resource_provider(key) : base::StringPiece(); } } // namespace net -- cgit v1.1