Move string files in base/ to the string subdirectory.

base/stringprintf.h

Index: base/stringprintf.h
diff --git a/base/stringprintf.h b/base/stringprintf.h
index 3946f3db5e123aa9485c55c306cf726139ee160e..17c3a5e8453022889e3e21716e122dde334fc2ec 100644
--- a/base/stringprintf.h
+++ b/base/stringprintf.h
@@ -1,62 +1,7 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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.
 
-#ifndef BASE_STRINGPRINTF_H_
-#define BASE_STRINGPRINTF_H_
-
-#include <stdarg.h>   // va_list
-
-#include <string>
-
-#include "base/base_export.h"
-#include "base/compiler_specific.h"
-
-namespace base {
-
-// Return a C++ string given printf-like input.
-BASE_EXPORT std::string StringPrintf(const char* format, ...)
-    PRINTF_FORMAT(1, 2);
-// OS_ANDROID's libc does not support wchar_t, so several overloads are omitted.
-#if !defined(OS_ANDROID)
-BASE_EXPORT std::wstring StringPrintf(const wchar_t* format, ...)
-    WPRINTF_FORMAT(1, 2);
-#endif
-
-// Return a C++ string given vprintf-like input.
-BASE_EXPORT std::string StringPrintV(const char* format, va_list ap)
-    PRINTF_FORMAT(1, 0);
-
-// Store result into a supplied string and return it.
-BASE_EXPORT const std::string& SStringPrintf(std::string* dst,
-                                             const char* format, ...)
-    PRINTF_FORMAT(2, 3);
-#if !defined(OS_ANDROID)
-BASE_EXPORT const std::wstring& SStringPrintf(std::wstring* dst,
-                                              const wchar_t* format, ...)
-    WPRINTF_FORMAT(2, 3);
-#endif
-
-// Append result to a supplied string.
-BASE_EXPORT void StringAppendF(std::string* dst, const char* format, ...)
-    PRINTF_FORMAT(2, 3);
-#if !defined(OS_ANDROID)
-// TODO(evanm): this is only used in a few places in the code;
-// replace with string16 version.
-BASE_EXPORT void StringAppendF(std::wstring* dst, const wchar_t* format, ...)
-    WPRINTF_FORMAT(2, 3);
-#endif
-
-// Lower-level routine that takes a va_list and appends to a specified
-// string.  All other routines are just convenience wrappers around it.
-BASE_EXPORT void StringAppendV(std::string* dst, const char* format, va_list ap)
-    PRINTF_FORMAT(2, 0);
-#if !defined(OS_ANDROID)
-BASE_EXPORT void StringAppendV(std::wstring* dst,
-                               const wchar_t* format, va_list ap)
-    WPRINTF_FORMAT(2, 0);
-#endif
-
-}  // namespace base
-
-#endif  // BASE_STRINGPRINTF_H_
+// This file has moved, please use the new location.
+// TODO(avi) remove this file when all users have been updated.
+#include "base/strings/stringprintf.h"