Use a direct include of strings headers, delete some strings forwarding headers.

BUG=247723
TEST=everything compiles OK
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/17390010

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

8 files changed, 2 insertions, 43 deletions

diff --git a/base/message_loop/message_pump_win.cc b/base/message_loop/message_pump_win.cc
index 36a3210..6d9863a 100644
--- a/base/message_loop/message_pump_win.cc
+++ b/base/message_loop/message_pump_win.cc
@@ -10,7 +10,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/process_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/win/wrapped_window_proc.h"
 
 namespace base {
diff --git a/base/nullable_string16.h b/base/nullable_string16.h
deleted file mode 100644
index 3adae7a..0000000
--- a/base/nullable_string16.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// 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.
-
-// This file has moved, please use the new location.
-// TODO(avi) remove this file when all users have been updated.
-#include "base/strings/nullable_string16.h"
diff --git a/base/string16.h b/base/string16.h
deleted file mode 100644
index 4fea704..0000000
--- a/base/string16.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// 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.
-
-// This file has moved, please use the new location.
-// TODO(avi) remove this file when all users have been updated.
-#include "base/strings/string16.h"
diff --git a/base/string_number_conversions.h b/base/string_number_conversions.h
deleted file mode 100644
index c1ce55c..0000000
--- a/base/string_number_conversions.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// 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.
-
-// This file has moved, please use the new location.
-// TODO(brettw) remove this file when all users have been updated.
-#include "base/strings/string_number_conversions.h"
diff --git a/base/string_util_posix.h b/base/string_util_posix.h
deleted file mode 100644
index e826690..0000000
--- a/base/string_util_posix.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// 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.
-
-// This file has moved, please use the new location.
-// TODO(avi) remove this file when all users have been updated.
-#include "base/strings/string_util_posix.h"
diff --git a/base/string_util_win.h b/base/string_util_win.h
deleted file mode 100644
index 29bc4aa..0000000
--- a/base/string_util_win.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// 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.
-
-// This file has moved, please use the new location.
-// TODO(avi) remove this file when all users have been updated.
-#include "base/strings/string_util_win.h"
diff --git a/base/strings/nullable_string16.cc b/base/strings/nullable_string16.cc
index 740147b..07f81d4 100644
--- a/base/strings/nullable_string16.cc
+++ b/base/strings/nullable_string16.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/nullable_string16.h"
+#include "base/strings/nullable_string16.h"
 
 #include <ostream>
 
diff --git a/base/utf_string_conversions.h b/base/utf_string_conversions.h
deleted file mode 100644
index 284f45c..0000000
--- a/base/utf_string_conversions.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright (c) 2011 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.
-
-// TODO(brettw) remove this header once all callers are fixed up.
-#include "base/strings/utf_string_conversions.h"