Remove forward declares for ASCIIToUTF16 from string_util. All callers now use

utf_string_conversions.h

TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3148019

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

2 files changed, 13 insertions, 5 deletions

diff --git a/base/native_library_mac.mm b/base/native_library_mac.mm
index 8aaeeb1..d13a4b6 100644
--- a/base/native_library_mac.mm
+++ b/base/native_library_mac.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -11,6 +11,7 @@
 #include "base/file_util.h"
 #include "base/scoped_cftyperef.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 
 namespace base {
 
diff --git a/base/string_util.h b/base/string_util.h
index c69b2de..1b657ad 100644
--- a/base/string_util.h
+++ b/base/string_util.h
@@ -237,15 +237,22 @@ bool ContainsOnlyChars(const std::string& input, const std::string& characters);
 std::string WideToASCII(const std::wstring& wide);
 std::string UTF16ToASCII(const string16& utf16);
 
+#ifdef RLZ_WIN_LIB_RLZ_LIB_H_
 // Forward-declares for functions in utf_string_conversions.h. They used to
-// be here and they were moved. We keep these here so the entire project
-// doesn't need to be switched at once.
-// TODO(brettw) delete these when everybody includes utf_string_conversions.h
-// instead.
+// be here and they were moved. We keep these here temporarily until all
+// callers are converted.
+//
+// Currently, the only user is the RLZ project which needs to be updated
+// asynchronously. It's needed in only one file, so we key off of the ifdef
+// for that particular file to allow this case yet prevent other users from
+// adding dependencies on this file.
+//
+// TODO(brettw) delete these when we fix RLZ to use the right header.
 std::wstring ASCIIToWide(const char* ascii);
 std::wstring ASCIIToWide(const std::string& ascii);
 string16 ASCIIToUTF16(const char* ascii);
 string16 ASCIIToUTF16(const std::string& ascii);
+#endif  // RLZ_WIN_LIB_RLZ_LIB_H_
 
 // Converts the given wide string to the corresponding Latin1. This will fail
 // (return false) if any characters are more than 255.