Remove forwarding include for base/files/file_path except for MTPD.

Fix up remaining/new uses of base/file_path.h
MTPD must be updated in a separate pass due to a circular dependency.

BUG=

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

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

9 files changed, 12 insertions, 9 deletions

diff --git a/base/file_path.h b/base/file_path.h
index c41ddd2..9faacf3 100644
--- a/base/file_path.h
+++ b/base/file_path.h
@@ -2,5 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(brettw) remove this file.
+// TODO(brettw) remove this file when third_party/mtpd/source/device_manager.cc
+// no longer uses this old location.
+#ifdef MTPD_DEVICE_MANAGER_H_
 #include "base/files/file_path.h"
+#endif
diff --git a/chrome/browser/android/chrome_web_contents_delegate_android.h b/chrome/browser/android/chrome_web_contents_delegate_android.h
index b83de0bc..1d1389b 100644
--- a/chrome/browser/android/chrome_web_contents_delegate_android.h
+++ b/chrome/browser/android/chrome_web_contents_delegate_android.h
@@ -7,7 +7,7 @@
 
 #include <jni.h>
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/time.h"
 #include "components/web_contents_delegate_android/web_contents_delegate_android.h"
 #include "content/public/browser/notification_observer.h"
diff --git a/chrome/browser/policy/device_local_account_browsertest.cc b/chrome/browser/policy/device_local_account_browsertest.cc
index f70e493..fe48d47 100644
--- a/chrome/browser/policy/device_local_account_browsertest.cc
+++ b/chrome/browser/policy/device_local_account_browsertest.cc
@@ -9,8 +9,8 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
-#include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
diff --git a/chrome/service/cloud_print/printer_job_queue_handler.h b/chrome/service/cloud_print/printer_job_queue_handler.h
index 9dd760f..5025c36 100644
--- a/chrome/service/cloud_print/printer_job_queue_handler.h
+++ b/chrome/service/cloud_print/printer_job_queue_handler.h
@@ -10,7 +10,7 @@
 #include <utility>
 #include <vector>
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
diff --git a/chrome/test/base/chrome_test_launcher.cc b/chrome/test/base/chrome_test_launcher.cc
index e39dd70f..cd1a071 100644
--- a/chrome/test/base/chrome_test_launcher.cc
+++ b/chrome/test/base/chrome_test_launcher.cc
@@ -7,7 +7,7 @@
 #include <stack>
 
 #include "base/command_line.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
diff --git a/media/audio/pulse/audio_manager_pulse.cc b/media/audio/pulse/audio_manager_pulse.cc
index 0cdcb86..f448fce 100644
--- a/media/audio/pulse/audio_manager_pulse.cc
+++ b/media/audio/pulse/audio_manager_pulse.cc
@@ -6,7 +6,7 @@
 
 #include "base/command_line.h"
 #include "base/environment.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/nix/xdg_util.h"
 #include "base/process_util.h"
diff --git a/remoting/host/host_main.cc b/remoting/host/host_main.cc
index c6af95d..96b2752 100644
--- a/remoting/host/host_main.cc
+++ b/remoting/host/host_main.cc
@@ -11,7 +11,7 @@
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "base/strings/stringize_macros.h"
diff --git a/tools/generate_library_loader/generate_library_loader.py b/tools/generate_library_loader/generate_library_loader.py
index a39e9ea..866e005 100755
--- a/tools/generate_library_loader/generate_library_loader.py
+++ b/tools/generate_library_loader/generate_library_loader.py
@@ -82,7 +82,7 @@ IMPL_TEMPLATE = """// This is generated file. Do not modify directly.
 #error both %(unique_prefix)s_DLOPEN and %(unique_prefix)s_DT_NEEDED defined
 #endif
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
 
 %(class_name)s::%(class_name)s() : loaded_(false) {
diff --git a/webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp b/webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp
index fc66332..dd64702 100644
--- a/webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp
+++ b/webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp
@@ -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/file_path.h"
+#include "base/files/file_path.h"
 #include "base/file_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebImageDecoder.h"
 #include "webkit/tools/test_shell/image_decoder_unittest.h"