[OSX] Remove wide->NSString conversion

Since we a) have a PRESUBMIT check for wstring in new code and b) this code isn't used any more.... might as well kill it.

TBR=rsesek@chromium.org
R=mark@chromium.org

BUG=none
TEST=none


Review URL: https://chromiumcodereview.appspot.com/10818016

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

3 files changed, 3 insertions, 28 deletions

diff --git a/base/sys_string_conversions.h b/base/sys_string_conversions.h
index 1c3bfcf..3f7631c 100644
--- a/base/sys_string_conversions.h
+++ b/base/sys_string_conversions.h
@@ -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.
 
@@ -62,23 +62,19 @@ BASE_EXPORT std::string SysWideToMultiByte(const std::wstring& wide,
 // for releasing it. Returns NULL on failure.
 BASE_EXPORT CFStringRef SysUTF8ToCFStringRef(const std::string& utf8);
 BASE_EXPORT CFStringRef SysUTF16ToCFStringRef(const string16& utf16);
-BASE_EXPORT CFStringRef SysWideToCFStringRef(const std::wstring& wide);
 
 // Same, but returns an autoreleased NSString.
 BASE_EXPORT NSString* SysUTF8ToNSString(const std::string& utf8);
 BASE_EXPORT NSString* SysUTF16ToNSString(const string16& utf16);
-BASE_EXPORT NSString* SysWideToNSString(const std::wstring& wide);
 
 // Converts a CFStringRef to an STL string. Returns an empty string on failure.
 BASE_EXPORT std::string SysCFStringRefToUTF8(CFStringRef ref);
 BASE_EXPORT string16 SysCFStringRefToUTF16(CFStringRef ref);
-BASE_EXPORT std::wstring SysCFStringRefToWide(CFStringRef ref);
 
 // Same, but accepts NSString input. Converts nil NSString* to the appropriate
 // string type of length 0.
 BASE_EXPORT std::string SysNSStringToUTF8(NSString* ref);
 BASE_EXPORT string16 SysNSStringToUTF16(NSString* ref);
-BASE_EXPORT std::wstring SysNSStringToWide(NSString* ref);
 
 #endif  // defined(OS_MACOSX)
 
diff --git a/base/sys_string_conversions_mac.mm b/base/sys_string_conversions_mac.mm
index 5f507ce..d1e3743 100644
--- a/base/sys_string_conversions_mac.mm
+++ b/base/sys_string_conversions_mac.mm
@@ -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.
 
@@ -152,10 +152,6 @@ CFStringRef SysUTF16ToCFStringRef(const string16& utf16) {
   return STLStringToCFStringWithEncodingsT(utf16, kMediumStringEncoding);
 }
 
-CFStringRef SysWideToCFStringRef(const std::wstring& wide) {
-  return STLStringToCFStringWithEncodingsT(wide, kWideStringEncoding);
-}
-
 NSString* SysUTF8ToNSString(const std::string& utf8) {
   return (NSString*)base::mac::CFTypeRefToNSObjectAutorelease(
       SysUTF8ToCFStringRef(utf8));
@@ -166,11 +162,6 @@ NSString* SysUTF16ToNSString(const string16& utf16) {
       SysUTF16ToCFStringRef(utf16));
 }
 
-NSString* SysWideToNSString(const std::wstring& wide) {
-  return (NSString*)base::mac::CFTypeRefToNSObjectAutorelease(
-      SysWideToCFStringRef(wide));
-}
-
 std::string SysCFStringRefToUTF8(CFStringRef ref) {
   return CFStringToSTLStringWithEncodingT<std::string>(ref,
                                                        kNarrowStringEncoding);
@@ -181,11 +172,6 @@ string16 SysCFStringRefToUTF16(CFStringRef ref) {
                                                     kMediumStringEncoding);
 }
 
-std::wstring SysCFStringRefToWide(CFStringRef ref) {
-  return CFStringToSTLStringWithEncodingT<std::wstring>(ref,
-                                                        kWideStringEncoding);
-}
-
 std::string SysNSStringToUTF8(NSString* nsstring) {
   if (!nsstring)
     return std::string();
@@ -198,10 +184,4 @@ string16 SysNSStringToUTF16(NSString* nsstring) {
   return SysCFStringRefToUTF16(reinterpret_cast<CFStringRef>(nsstring));
 }
 
-std::wstring SysNSStringToWide(NSString* nsstring) {
-  if (!nsstring)
-    return std::wstring();
-  return SysCFStringRefToWide(reinterpret_cast<CFStringRef>(nsstring));
-}
-
 }  // namespace base
diff --git a/base/sys_string_conversions_mac_unittest.mm b/base/sys_string_conversions_mac_unittest.mm
index 628b515..8b0ac88 100644
--- a/base/sys_string_conversions_mac_unittest.mm
+++ b/base/sys_string_conversions_mac_unittest.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
 
@@ -15,5 +15,4 @@ TEST(SysStrings, ConversionsFromNSString) {
   // Conversions should be able to handle a NULL value without crashing.
   EXPECT_STREQ("", base::SysNSStringToUTF8(nil).c_str());
   EXPECT_EQ(string16(), base::SysNSStringToUTF16(nil));
-  EXPECT_STREQ(L"", base::SysNSStringToWide(nil).c_str());
 }