net/base: remove some wstrings

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

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

2 files changed, 5 insertions, 5 deletions

diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index 12190d6..9417c1a 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -1518,7 +1518,7 @@ string16 GetSuggestedFilename(const GURL& url,
   // whitespace to prevent file extension obfuscation on trusted websites
   // e.g. Gmail might think evil.exe. is safe, so we don't want it to become
   // evil.exe when we download it
-  std::wstring::size_type path_length_before_trim = path.length();
+  string16::size_type path_length_before_trim = path.length();
   TrimWhitespace(path, TRIM_TRAILING, &path);
   trimmed_trailing_character_count += path_length_before_trim - path.length();
   file_util::ReplaceIllegalCharactersInPath(&path, '-');
diff --git a/net/base/registry_controlled_domain_unittest.cc b/net/base/registry_controlled_domain_unittest.cc
index c0fd07f..464e417 100644
--- a/net/base/registry_controlled_domain_unittest.cc
+++ b/net/base/registry_controlled_domain_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -89,7 +89,7 @@ TEST_F(RegistryControlledDomainTest, TestGetDomainAndRegistry) {
   EXPECT_EQ("", GetDomainFromURL("http://localhost."));
   EXPECT_EQ("", GetDomainFromURL("http:////Comment"));
 
-  // Test std::wstring version of GetDomainAndRegistry().  Uses the same
+  // Test std::string version of GetDomainAndRegistry().  Uses the same
   // underpinnings as the GURL version, so this is really more of a check of
   // CanonicalizeHost().
   EXPECT_EQ("baz.jp", GetDomainFromHost("a.baz.jp"));                  // 1
@@ -156,7 +156,7 @@ TEST_F(RegistryControlledDomainTest, TestGetRegistryLength) {
   EXPECT_EQ(0U, GetRegistryLengthFromURL("http://localhost.", true));
   EXPECT_EQ(0U, GetRegistryLengthFromURL("http:////Comment", false));
 
-  // Test std::wstring version of GetRegistryLength().  Uses the same
+  // Test std::string version of GetRegistryLength().  Uses the same
   // underpinnings as the GURL version, so this is really more of a check of
   // CanonicalizeHost().
   EXPECT_EQ(2U, GetRegistryLengthFromHost("a.baz.jp", false));          // 1