diff options
1203 files changed, 1790 insertions, 1781 deletions
diff --git a/android_webview/browser/aw_browser_context.h b/android_webview/browser/aw_browser_context.h index 517f307..c0916c9 100644 --- a/android_webview/browser/aw_browser_context.h +++ b/android_webview/browser/aw_browser_context.h @@ -10,7 +10,7 @@ #include "android_webview/browser/aw_download_manager_delegate.h" #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "components/visitedlink/browser/visitedlink_delegate.h" diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc index 11aaf5c..91824f8 100644 --- a/android_webview/browser/aw_browser_main_parts.cc +++ b/android_webview/browser/aw_browser_main_parts.cc @@ -7,7 +7,7 @@ #include "android_webview/browser/aw_browser_context.h" #include "android_webview/browser/aw_result_codes.h" #include "base/android/build_info.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "content/public/browser/android/compositor.h" #include "content/public/browser/content_browser_client.h" diff --git a/android_webview/browser/aw_download_manager_delegate.cc b/android_webview/browser/aw_download_manager_delegate.cc index 0c3397a..66b4976 100644 --- a/android_webview/browser/aw_download_manager_delegate.cc +++ b/android_webview/browser/aw_download_manager_delegate.cc @@ -4,7 +4,7 @@ #include "android_webview/browser/aw_download_manager_delegate.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/public/browser/download_danger_type.h" #include "content/public/browser/download_item.h" diff --git a/apps/app_host/app_host_main.cc b/apps/app_host/app_host_main.cc index 64de547..cf0fd26 100644 --- a/apps/app_host/app_host_main.cc +++ b/apps/app_host/app_host_main.cc @@ -8,7 +8,7 @@ #include "apps/app_host/update.h" #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/process_util.h" #include "chrome/installer/launcher_support/chrome_launcher_support.h" diff --git a/ash/shell/content_client/shell_main_delegate.cc b/ash/shell/content_client/shell_main_delegate.cc index 343ba27..c356e45 100644 --- a/ash/shell/content_client/shell_main_delegate.cc +++ b/ash/shell/content_client/shell_main_delegate.cc @@ -6,7 +6,7 @@ #include "ash/shell/content_client/shell_content_browser_client.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "content/public/common/content_switches.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ash/system/tray/system_tray_delegate.h b/ash/system/tray/system_tray_delegate.h index 2e8dd4f4..1baccf3 100644 --- a/ash/system/tray/system_tray_delegate.h +++ b/ash/system/tray/system_tray_delegate.h @@ -11,7 +11,7 @@ #include "ash/ash_export.h" #include "ash/system/power/power_supply_status.h" #include "ash/system/user/login_status.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/time_formatting.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" diff --git a/ash/test/test_metro_viewer_process_host.cc b/ash/test/test_metro_viewer_process_host.cc index a70fa3b..3d58f6f 100644 --- a/ash/test/test_metro_viewer_process_host.cc +++ b/ash/test/test_metro_viewer_process_host.cc @@ -8,8 +8,8 @@ #include <shlobj.h> #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "base/time.h" #include "base/win/scoped_com_initializer.h" diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc index 7ffe3b2..f606829f 100644 --- a/ash/test/test_suite.cc +++ b/ash/test/test_suite.cc @@ -4,7 +4,7 @@ #include "ash/test/test_suite.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ash/test/test_suite_init.mm b/ash/test/test_suite_init.mm index d60b3e2..1564c38 100644 --- a/ash/test/test_suite_init.mm +++ b/ash/test/test_suite_init.mm @@ -6,7 +6,7 @@ #import <Cocoa/Cocoa.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/bundle_locations.h" #include "base/memory/scoped_nsobject.h" #include "base/path_service.h" diff --git a/base/android/path_service_android.cc b/base/android/path_service_android.cc index a9bf92d..18ca70c 100644 --- a/base/android/path_service_android.cc +++ b/base/android/path_service_android.cc @@ -4,10 +4,10 @@ #include "base/android/path_service_android.h" -#include "base/file_path.h" -#include "base/path_service.h" #include "base/android/jni_android.h" #include "base/android/jni_string.h" +#include "base/files/file_path.h" +#include "base/path_service.h" #include "jni/PathService_jni.h" namespace base { diff --git a/base/android/path_utils.cc b/base/android/path_utils.cc index 3d86177..5737227 100644 --- a/base/android/path_utils.cc +++ b/base/android/path_utils.cc @@ -7,7 +7,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "jni/PathUtils_jni.h" diff --git a/base/android/path_utils_unittest.cc b/base/android/path_utils_unittest.cc index 636e3fa..52b1928 100644 --- a/base/android/path_utils_unittest.cc +++ b/base/android/path_utils_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/android/path_utils.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/base.gyp b/base/base.gyp index 7c63ec2..93f9d28 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -450,10 +450,10 @@ 'debug/trace_event_unittest.h', 'debug/trace_event_win_unittest.cc', 'environment_unittest.cc', - 'file_path_unittest.cc', 'file_util_unittest.cc', 'file_version_info_unittest.cc', 'files/dir_reader_posix_unittest.cc', + 'files/file_path_unittest.cc', 'files/file_util_proxy_unittest.cc', 'files/important_file_writer_unittest.cc', 'files/scoped_temp_dir_unittest.cc', diff --git a/base/base.gypi b/base/base.gypi index 7cad42a..35776f7 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -141,8 +141,6 @@ 'environment.cc', 'environment.h', 'file_descriptor_posix.h', - 'file_path.cc', - 'file_path.h', 'file_util.cc', 'file_util.h', 'file_util_android.cc', @@ -158,6 +156,8 @@ 'files/dir_reader_fallback.h', 'files/dir_reader_linux.h', 'files/dir_reader_posix.h', + 'files/file_path.cc', + 'files/file_path.h', 'files/file_path_watcher.cc', 'files/file_path_watcher.h', 'files/file_path_watcher_kqueue.cc', diff --git a/base/base_paths.cc b/base/base_paths.cc index 80105b6..05a55af 100644 --- a/base/base_paths.cc +++ b/base/base_paths.cc @@ -4,8 +4,8 @@ #include "base/base_paths.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" namespace base { diff --git a/base/base_paths_android.cc b/base/base_paths_android.cc index 9905200..edbe7cd 100644 --- a/base/base_paths_android.cc +++ b/base/base_paths_android.cc @@ -10,8 +10,8 @@ #include "base/android/jni_android.h" #include "base/android/path_utils.h" #include "base/base_paths.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/process_util.h" diff --git a/base/base_paths_mac.mm b/base/base_paths_mac.mm index 39a5814..8db5647 100644 --- a/base/base_paths_mac.mm +++ b/base/base_paths_mac.mm @@ -11,8 +11,8 @@ #include "base/base_paths.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/mac/foundation_util.h" #include "base/path_service.h" diff --git a/base/base_paths_posix.cc b/base/base_paths_posix.cc index 834dee3..59be094 100644 --- a/base/base_paths_posix.cc +++ b/base/base_paths_posix.cc @@ -11,13 +11,13 @@ #include "base/base_paths.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/nix/xdg_util.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/nix/xdg_util.h" #include "build/build_config.h" #if defined(OS_FREEBSD) diff --git a/base/base_paths_win.cc b/base/base_paths_win.cc index bd4c791..f4dd434 100644 --- a/base/base_paths_win.cc +++ b/base/base_paths_win.cc @@ -7,8 +7,8 @@ #include <shlobj.h> #include "base/base_paths.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/win/scoped_co_mem.h" #include "base/win/windows_version.h" diff --git a/base/command_line.cc b/base/command_line.cc index 1c73846..9aa68be 100644 --- a/base/command_line.cc +++ b/base/command_line.cc @@ -8,7 +8,7 @@ #include <ostream> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/string_util.h" #include "base/strings/string_split.h" diff --git a/base/command_line_unittest.cc b/base/command_line_unittest.cc index 62080d1..ca7c9fb 100644 --- a/base/command_line_unittest.cc +++ b/base/command_line_unittest.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/file_path.h b/base/file_path.h index c9a9bc9..c41ddd2 100644 --- a/base/file_path.h +++ b/base/file_path.h @@ -2,441 +2,5 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// FilePath is a container for pathnames stored in a platform's native string -// type, providing containers for manipulation in according with the -// platform's conventions for pathnames. It supports the following path -// types: -// -// POSIX Windows -// --------------- ---------------------------------- -// Fundamental type char[] wchar_t[] -// Encoding unspecified* UTF-16 -// Separator / \, tolerant of / -// Drive letters no case-insensitive A-Z followed by : -// Alternate root // (surprise!) \\, for UNC paths -// -// * The encoding need not be specified on POSIX systems, although some -// POSIX-compliant systems do specify an encoding. Mac OS X uses UTF-8. -// Chrome OS also uses UTF-8. -// Linux does not specify an encoding, but in practice, the locale's -// character set may be used. -// -// For more arcane bits of path trivia, see below. -// -// FilePath objects are intended to be used anywhere paths are. An -// application may pass FilePath objects around internally, masking the -// underlying differences between systems, only differing in implementation -// where interfacing directly with the system. For example, a single -// OpenFile(const FilePath &) function may be made available, allowing all -// callers to operate without regard to the underlying implementation. On -// POSIX-like platforms, OpenFile might wrap fopen, and on Windows, it might -// wrap _wfopen_s, perhaps both by calling file_path.value().c_str(). This -// allows each platform to pass pathnames around without requiring conversions -// between encodings, which has an impact on performance, but more imporantly, -// has an impact on correctness on platforms that do not have well-defined -// encodings for pathnames. -// -// Several methods are available to perform common operations on a FilePath -// object, such as determining the parent directory (DirName), isolating the -// final path component (BaseName), and appending a relative pathname string -// to an existing FilePath object (Append). These methods are highly -// recommended over attempting to split and concatenate strings directly. -// These methods are based purely on string manipulation and knowledge of -// platform-specific pathname conventions, and do not consult the filesystem -// at all, making them safe to use without fear of blocking on I/O operations. -// These methods do not function as mutators but instead return distinct -// instances of FilePath objects, and are therefore safe to use on const -// objects. The objects themselves are safe to share between threads. -// -// To aid in initialization of FilePath objects from string literals, a -// FILE_PATH_LITERAL macro is provided, which accounts for the difference -// between char[]-based pathnames on POSIX systems and wchar_t[]-based -// pathnames on Windows. -// -// Paths can't contain NULs as a precaution agaist premature truncation. -// -// Because a FilePath object should not be instantiated at the global scope, -// instead, use a FilePath::CharType[] and initialize it with -// FILE_PATH_LITERAL. At runtime, a FilePath object can be created from the -// character array. Example: -// -// | const FilePath::CharType kLogFileName[] = FILE_PATH_LITERAL("log.txt"); -// | -// | void Function() { -// | FilePath log_file_path(kLogFileName); -// | [...] -// | } -// -// WARNING: FilePaths should ALWAYS be displayed with LTR directionality, even -// when the UI language is RTL. This means you always need to pass filepaths -// through base::i18n::WrapPathWithLTRFormatting() before displaying it in the -// RTL UI. -// -// This is a very common source of bugs, please try to keep this in mind. -// -// ARCANE BITS OF PATH TRIVIA -// -// - A double leading slash is actually part of the POSIX standard. Systems -// are allowed to treat // as an alternate root, as Windows does for UNC -// (network share) paths. Most POSIX systems don't do anything special -// with two leading slashes, but FilePath handles this case properly -// in case it ever comes across such a system. FilePath needs this support -// for Windows UNC paths, anyway. -// References: -// The Open Group Base Specifications Issue 7, sections 3.266 ("Pathname") -// and 4.12 ("Pathname Resolution"), available at: -// http://www.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_266 -// http://www.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap04.html#tag_04_12 -// -// - Windows treats c:\\ the same way it treats \\. This was intended to -// allow older applications that require drive letters to support UNC paths -// like \\server\share\path, by permitting c:\\server\share\path as an -// equivalent. Since the OS treats these paths specially, FilePath needs -// to do the same. Since Windows can use either / or \ as the separator, -// FilePath treats c://, c:\\, //, and \\ all equivalently. -// Reference: -// The Old New Thing, "Why is a drive letter permitted in front of UNC -// paths (sometimes)?", available at: -// http://blogs.msdn.com/oldnewthing/archive/2005/11/22/495740.aspx - -#ifndef BASE_FILE_PATH_H_ -#define BASE_FILE_PATH_H_ - -#include <stddef.h> -#include <string> -#include <vector> - -#include "base/base_export.h" -#include "base/compiler_specific.h" -#include "base/hash_tables.h" -#include "base/string16.h" -#include "base/string_piece.h" // For implicit conversions. -#include "build/build_config.h" - -// Windows-style drive letter support and pathname separator characters can be -// enabled and disabled independently, to aid testing. These #defines are -// here so that the same setting can be used in both the implementation and -// in the unit test. -#if defined(OS_WIN) -#define FILE_PATH_USES_DRIVE_LETTERS -#define FILE_PATH_USES_WIN_SEPARATORS -#endif // OS_WIN - -class Pickle; -class PickleIterator; - -namespace base { - -// An abstraction to isolate users from the differences between native -// pathnames on different platforms. -class BASE_EXPORT FilePath { - public: -#if defined(OS_POSIX) - // On most platforms, native pathnames are char arrays, and the encoding - // may or may not be specified. On Mac OS X, native pathnames are encoded - // in UTF-8. - typedef std::string StringType; -#elif defined(OS_WIN) - // On Windows, for Unicode-aware applications, native pathnames are wchar_t - // arrays encoded in UTF-16. - typedef std::wstring StringType; -#endif // OS_WIN - - typedef StringType::value_type CharType; - - // Null-terminated array of separators used to separate components in - // hierarchical paths. Each character in this array is a valid separator, - // but kSeparators[0] is treated as the canonical separator and will be used - // when composing pathnames. - static const CharType kSeparators[]; - - // A special path component meaning "this directory." - static const CharType kCurrentDirectory[]; - - // A special path component meaning "the parent directory." - static const CharType kParentDirectory[]; - - // The character used to identify a file extension. - static const CharType kExtensionSeparator; - - FilePath(); - FilePath(const FilePath& that); - explicit FilePath(const StringType& path); - ~FilePath(); - FilePath& operator=(const FilePath& that); - - bool operator==(const FilePath& that) const; - - bool operator!=(const FilePath& that) const; - - // Required for some STL containers and operations - bool operator<(const FilePath& that) const { - return path_ < that.path_; - } - - const StringType& value() const { return path_; } - - bool empty() const { return path_.empty(); } - - void clear() { path_.clear(); } - - // Returns true if |character| is in kSeparators. - static bool IsSeparator(CharType character); - - // Returns a vector of all of the components of the provided path. It is - // equivalent to calling DirName().value() on the path's root component, - // and BaseName().value() on each child component. - void GetComponents(std::vector<FilePath::StringType>* components) const; - - // Returns true if this FilePath is a strict parent of the |child|. Absolute - // and relative paths are accepted i.e. is /foo parent to /foo/bar and - // is foo parent to foo/bar. Does not convert paths to absolute, follow - // symlinks or directory navigation (e.g. ".."). A path is *NOT* its own - // parent. - bool IsParent(const FilePath& child) const; - - // If IsParent(child) holds, appends to path (if non-NULL) the - // relative path to child and returns true. For example, if parent - // holds "/Users/johndoe/Library/Application Support", child holds - // "/Users/johndoe/Library/Application Support/Google/Chrome/Default", and - // *path holds "/Users/johndoe/Library/Caches", then after - // parent.AppendRelativePath(child, path) is called *path will hold - // "/Users/johndoe/Library/Caches/Google/Chrome/Default". Otherwise, - // returns false. - bool AppendRelativePath(const FilePath& child, FilePath* path) const; - - // Returns a FilePath corresponding to the directory containing the path - // named by this object, stripping away the file component. If this object - // only contains one component, returns a FilePath identifying - // kCurrentDirectory. If this object already refers to the root directory, - // returns a FilePath identifying the root directory. - FilePath DirName() const WARN_UNUSED_RESULT; - - // Returns a FilePath corresponding to the last path component of this - // object, either a file or a directory. If this object already refers to - // the root directory, returns a FilePath identifying the root directory; - // this is the only situation in which BaseName will return an absolute path. - FilePath BaseName() const WARN_UNUSED_RESULT; - - // Returns ".jpg" for path "C:\pics\jojo.jpg", or an empty string if - // the file has no extension. If non-empty, Extension() will always start - // with precisely one ".". The following code should always work regardless - // of the value of path. - // new_path = path.RemoveExtension().value().append(path.Extension()); - // ASSERT(new_path == path.value()); - // NOTE: this is different from the original file_util implementation which - // returned the extension without a leading "." ("jpg" instead of ".jpg") - StringType Extension() const; - - // Returns "C:\pics\jojo" for path "C:\pics\jojo.jpg" - // NOTE: this is slightly different from the similar file_util implementation - // which returned simply 'jojo'. - FilePath RemoveExtension() const WARN_UNUSED_RESULT; - - // Inserts |suffix| after the file name portion of |path| but before the - // extension. Returns "" if BaseName() == "." or "..". - // Examples: - // path == "C:\pics\jojo.jpg" suffix == " (1)", returns "C:\pics\jojo (1).jpg" - // path == "jojo.jpg" suffix == " (1)", returns "jojo (1).jpg" - // path == "C:\pics\jojo" suffix == " (1)", returns "C:\pics\jojo (1)" - // path == "C:\pics.old\jojo" suffix == " (1)", returns "C:\pics.old\jojo (1)" - FilePath InsertBeforeExtension( - const StringType& suffix) const WARN_UNUSED_RESULT; - FilePath InsertBeforeExtensionASCII( - const base::StringPiece& suffix) const WARN_UNUSED_RESULT; - - // Adds |extension| to |file_name|. Returns the current FilePath if - // |extension| is empty. Returns "" if BaseName() == "." or "..". - FilePath AddExtension( - const StringType& extension) const WARN_UNUSED_RESULT; - - // Replaces the extension of |file_name| with |extension|. If |file_name| - // does not have an extension, then |extension| is added. If |extension| is - // empty, then the extension is removed from |file_name|. - // Returns "" if BaseName() == "." or "..". - FilePath ReplaceExtension( - const StringType& extension) const WARN_UNUSED_RESULT; - - // Returns true if the file path matches the specified extension. The test is - // case insensitive. Don't forget the leading period if appropriate. - bool MatchesExtension(const StringType& extension) const; - - // Returns a FilePath by appending a separator and the supplied path - // component to this object's path. Append takes care to avoid adding - // excessive separators if this object's path already ends with a separator. - // If this object's path is kCurrentDirectory, a new FilePath corresponding - // only to |component| is returned. |component| must be a relative path; - // it is an error to pass an absolute path. - FilePath Append(const StringType& component) const WARN_UNUSED_RESULT; - FilePath Append(const FilePath& component) const WARN_UNUSED_RESULT; - - // Although Windows StringType is std::wstring, since the encoding it uses for - // paths is well defined, it can handle ASCII path components as well. - // Mac uses UTF8, and since ASCII is a subset of that, it works there as well. - // On Linux, although it can use any 8-bit encoding for paths, we assume that - // ASCII is a valid subset, regardless of the encoding, since many operating - // system paths will always be ASCII. - FilePath AppendASCII(const base::StringPiece& component) - const WARN_UNUSED_RESULT; - - // Returns true if this FilePath contains an absolute path. On Windows, an - // absolute path begins with either a drive letter specification followed by - // a separator character, or with two separator characters. On POSIX - // platforms, an absolute path begins with a separator character. - bool IsAbsolute() const; - - // Returns a copy of this FilePath that does not end with a trailing - // separator. - FilePath StripTrailingSeparators() const WARN_UNUSED_RESULT; - - // Returns true if this FilePath contains any attempt to reference a parent - // directory (i.e. has a path component that is ".." - bool ReferencesParent() const; - - // Return a Unicode human-readable version of this path. - // Warning: you can *not*, in general, go from a display name back to a real - // path. Only use this when displaying paths to users, not just when you - // want to stuff a string16 into some other API. - string16 LossyDisplayName() const; - - // Return the path as ASCII, or the empty string if the path is not ASCII. - // This should only be used for cases where the FilePath is representing a - // known-ASCII filename. - std::string MaybeAsASCII() const; - - // Return the path as UTF-8. - // - // This function is *unsafe* as there is no way to tell what encoding is - // used in file names on POSIX systems other than Mac and Chrome OS, - // although UTF-8 is practically used everywhere these days. To mitigate - // the encoding issue, this function internally calls - // SysNativeMBToWide() on POSIX systems other than Mac and Chrome OS, - // per assumption that the current locale's encoding is used in file - // names, but this isn't a perfect solution. - // - // Once it becomes safe to to stop caring about non-UTF-8 file names, - // the SysNativeMBToWide() hack will be removed from the code, along - // with "Unsafe" in the function name. - std::string AsUTF8Unsafe() const; - - // Older Chromium code assumes that paths are always wstrings. - // This function converts wstrings to FilePaths, and is - // useful to smooth porting that old code to the FilePath API. - // It has "Hack" its name so people feel bad about using it. - // http://code.google.com/p/chromium/issues/detail?id=24672 - // - // If you are trying to be a good citizen and remove these, ask yourself: - // - Am I interacting with other Chrome code that deals with files? Then - // try to convert the API into using FilePath. - // - Am I interacting with OS-native calls? Then use value() to get at an - // OS-native string format. - // - Am I using well-known file names, like "config.ini"? Then use the - // ASCII functions (we require paths to always be supersets of ASCII). - // - Am I displaying a string to the user in some UI? Then use the - // LossyDisplayName() function, but keep in mind that you can't - // ever use the result of that again as a path. - static FilePath FromWStringHack(const std::wstring& wstring); - - // Returns a FilePath object from a path name in UTF-8. This function - // should only be used for cases where you are sure that the input - // string is UTF-8. - // - // Like AsUTF8Unsafe(), this function is unsafe. This function - // internally calls SysWideToNativeMB() on POSIX systems other than Mac - // and Chrome OS, to mitigate the encoding issue. See the comment at - // AsUTF8Unsafe() for details. - static FilePath FromUTF8Unsafe(const std::string& utf8); - - void WriteToPickle(Pickle* pickle) const; - bool ReadFromPickle(PickleIterator* iter); - - // Normalize all path separators to backslash on Windows - // (if FILE_PATH_USES_WIN_SEPARATORS is true), or do nothing on POSIX systems. - FilePath NormalizePathSeparators() const; - - // Compare two strings in the same way the file system does. - // Note that these always ignore case, even on file systems that are case- - // sensitive. If case-sensitive comparison is ever needed, add corresponding - // methods here. - // The methods are written as a static method so that they can also be used - // on parts of a file path, e.g., just the extension. - // CompareIgnoreCase() returns -1, 0 or 1 for less-than, equal-to and - // greater-than respectively. - static int CompareIgnoreCase(const StringType& string1, - const StringType& string2); - static bool CompareEqualIgnoreCase(const StringType& string1, - const StringType& string2) { - return CompareIgnoreCase(string1, string2) == 0; - } - static bool CompareLessIgnoreCase(const StringType& string1, - const StringType& string2) { - return CompareIgnoreCase(string1, string2) < 0; - } - -#if defined(OS_MACOSX) - // Returns the string in the special canonical decomposed form as defined for - // HFS, which is close to, but not quite, decomposition form D. See - // http://developer.apple.com/mac/library/technotes/tn/tn1150.html#UnicodeSubtleties - // for further comments. - // Returns the epmty string if the conversion failed. - static StringType GetHFSDecomposedForm(const FilePath::StringType& string); - - // Special UTF-8 version of FastUnicodeCompare. Cf: - // http://developer.apple.com/mac/library/technotes/tn/tn1150.html#StringComparisonAlgorithm - // IMPORTANT: The input strings must be in the special HFS decomposed form! - // (cf. above GetHFSDecomposedForm method) - static int HFSFastUnicodeCompare(const StringType& string1, - const StringType& string2); -#endif - - private: - // Remove trailing separators from this object. If the path is absolute, it - // will never be stripped any more than to refer to the absolute root - // directory, so "////" will become "/", not "". A leading pair of - // separators is never stripped, to support alternate roots. This is used to - // support UNC paths on Windows. - void StripTrailingSeparatorsInternal(); - - StringType path_; -}; - -} // namespace base - -// This is required by googletest to print a readable output on test failures. -BASE_EXPORT extern void PrintTo(const base::FilePath& path, std::ostream* out); - -// Macros for string literal initialization of FilePath::CharType[], and for -// using a FilePath::CharType[] in a printf-style format string. -#if defined(OS_POSIX) -#define FILE_PATH_LITERAL(x) x -#define PRFilePath "s" -#define PRFilePathLiteral "%s" -#elif defined(OS_WIN) -#define FILE_PATH_LITERAL(x) L ## x -#define PRFilePath "ls" -#define PRFilePathLiteral L"%ls" -#endif // OS_WIN - -// Provide a hash function so that hash_sets and maps can contain FilePath -// objects. -namespace BASE_HASH_NAMESPACE { -#if defined(COMPILER_GCC) - -template<> -struct hash<base::FilePath> { - size_t operator()(const base::FilePath& f) const { - return hash<base::FilePath::StringType>()(f.value()); - } -}; - -#elif defined(COMPILER_MSVC) - -inline size_t hash_value(const base::FilePath& f) { - return hash_value(f.value()); -} - -#endif // COMPILER - -} // namespace BASE_HASH_NAMESPACE - -#endif // BASE_FILE_PATH_H_ +// TODO(brettw) remove this file. +#include "base/files/file_path.h" diff --git a/base/file_util.cc b/base/file_util.cc index 03e70f9..b6cdc98 100644 --- a/base/file_util.cc +++ b/base/file_util.cc @@ -11,11 +11,11 @@ #include <fstream> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" -#include "base/stringprintf.h" #include "base/string_piece.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/utf_string_conversions.h" using base::FilePath; diff --git a/base/file_util.h b/base/file_util.h index 6a8fd05..e36456a 100644 --- a/base/file_util.h +++ b/base/file_util.h @@ -26,7 +26,7 @@ #include "base/base_export.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" #include "base/string16.h" diff --git a/base/file_util_android.cc b/base/file_util_android.cc index 615ffe6..6ac9def 100644 --- a/base/file_util_android.cc +++ b/base/file_util_android.cc @@ -4,7 +4,7 @@ #include "base/file_util.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" namespace file_util { diff --git a/base/file_util_linux.cc b/base/file_util_linux.cc index cee2526..e4f0e28 100644 --- a/base/file_util_linux.cc +++ b/base/file_util_linux.cc @@ -4,7 +4,7 @@ #include "base/file_util.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include <errno.h> #include <sys/vfs.h> diff --git a/base/file_util_mac.mm b/base/file_util_mac.mm index 0de3786..377654d 100644 --- a/base/file_util_mac.mm +++ b/base/file_util_mac.mm @@ -8,7 +8,7 @@ #include <copyfile.h> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/foundation_util.h" #include "base/string_util.h" #include "base/threading/thread_restrictions.h" diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc index 62bc9b3..974b30d 100644 --- a/base/file_util_posix.cc +++ b/base/file_util_posix.cc @@ -32,7 +32,7 @@ #include <fstream> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc index 8ae567d..b905654 100644 --- a/base/file_util_unittest.cc +++ b/base/file_util_unittest.cc @@ -17,8 +17,8 @@ #include <set> #include "base/base_paths.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/path_service.h" #include "base/test/test_file_util.h" diff --git a/base/file_util_win.cc b/base/file_util_win.cc index a5f7e4c..679b108 100644 --- a/base/file_util_win.cc +++ b/base/file_util_win.cc @@ -14,7 +14,7 @@ #include <limits> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/process_util.h" diff --git a/base/file_version_info_mac.mm b/base/file_version_info_mac.mm index 54af633..0c6f8d4 100644 --- a/base/file_version_info_mac.mm +++ b/base/file_version_info_mac.mm @@ -6,7 +6,7 @@ #import <Foundation/Foundation.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/mac/bundle_locations.h" #include "base/mac/foundation_util.h" diff --git a/base/file_version_info_win.cc b/base/file_version_info_win.cc index e5cd5f7..80dbaea 100644 --- a/base/file_version_info_win.cc +++ b/base/file_version_info_win.cc @@ -6,8 +6,8 @@ #include <windows.h> -#include "base/file_path.h" #include "base/file_version_info.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/threading/thread_restrictions.h" diff --git a/base/file_path.cc b/base/files/file_path.cc index d56d8d0..407ec85 100644 --- a/base/file_path.cc +++ b/base/files/file_path.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/file_path.h" +#include "base/files/file_path.h" #include <string.h> #include <algorithm> diff --git a/base/files/file_path.h b/base/files/file_path.h new file mode 100644 index 0000000..2e0009d --- /dev/null +++ b/base/files/file_path.h @@ -0,0 +1,442 @@ +// 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. + +// FilePath is a container for pathnames stored in a platform's native string +// type, providing containers for manipulation in according with the +// platform's conventions for pathnames. It supports the following path +// types: +// +// POSIX Windows +// --------------- ---------------------------------- +// Fundamental type char[] wchar_t[] +// Encoding unspecified* UTF-16 +// Separator / \, tolerant of / +// Drive letters no case-insensitive A-Z followed by : +// Alternate root // (surprise!) \\, for UNC paths +// +// * The encoding need not be specified on POSIX systems, although some +// POSIX-compliant systems do specify an encoding. Mac OS X uses UTF-8. +// Chrome OS also uses UTF-8. +// Linux does not specify an encoding, but in practice, the locale's +// character set may be used. +// +// For more arcane bits of path trivia, see below. +// +// FilePath objects are intended to be used anywhere paths are. An +// application may pass FilePath objects around internally, masking the +// underlying differences between systems, only differing in implementation +// where interfacing directly with the system. For example, a single +// OpenFile(const FilePath &) function may be made available, allowing all +// callers to operate without regard to the underlying implementation. On +// POSIX-like platforms, OpenFile might wrap fopen, and on Windows, it might +// wrap _wfopen_s, perhaps both by calling file_path.value().c_str(). This +// allows each platform to pass pathnames around without requiring conversions +// between encodings, which has an impact on performance, but more imporantly, +// has an impact on correctness on platforms that do not have well-defined +// encodings for pathnames. +// +// Several methods are available to perform common operations on a FilePath +// object, such as determining the parent directory (DirName), isolating the +// final path component (BaseName), and appending a relative pathname string +// to an existing FilePath object (Append). These methods are highly +// recommended over attempting to split and concatenate strings directly. +// These methods are based purely on string manipulation and knowledge of +// platform-specific pathname conventions, and do not consult the filesystem +// at all, making them safe to use without fear of blocking on I/O operations. +// These methods do not function as mutators but instead return distinct +// instances of FilePath objects, and are therefore safe to use on const +// objects. The objects themselves are safe to share between threads. +// +// To aid in initialization of FilePath objects from string literals, a +// FILE_PATH_LITERAL macro is provided, which accounts for the difference +// between char[]-based pathnames on POSIX systems and wchar_t[]-based +// pathnames on Windows. +// +// Paths can't contain NULs as a precaution agaist premature truncation. +// +// Because a FilePath object should not be instantiated at the global scope, +// instead, use a FilePath::CharType[] and initialize it with +// FILE_PATH_LITERAL. At runtime, a FilePath object can be created from the +// character array. Example: +// +// | const FilePath::CharType kLogFileName[] = FILE_PATH_LITERAL("log.txt"); +// | +// | void Function() { +// | FilePath log_file_path(kLogFileName); +// | [...] +// | } +// +// WARNING: FilePaths should ALWAYS be displayed with LTR directionality, even +// when the UI language is RTL. This means you always need to pass filepaths +// through base::i18n::WrapPathWithLTRFormatting() before displaying it in the +// RTL UI. +// +// This is a very common source of bugs, please try to keep this in mind. +// +// ARCANE BITS OF PATH TRIVIA +// +// - A double leading slash is actually part of the POSIX standard. Systems +// are allowed to treat // as an alternate root, as Windows does for UNC +// (network share) paths. Most POSIX systems don't do anything special +// with two leading slashes, but FilePath handles this case properly +// in case it ever comes across such a system. FilePath needs this support +// for Windows UNC paths, anyway. +// References: +// The Open Group Base Specifications Issue 7, sections 3.266 ("Pathname") +// and 4.12 ("Pathname Resolution"), available at: +// http://www.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_266 +// http://www.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap04.html#tag_04_12 +// +// - Windows treats c:\\ the same way it treats \\. This was intended to +// allow older applications that require drive letters to support UNC paths +// like \\server\share\path, by permitting c:\\server\share\path as an +// equivalent. Since the OS treats these paths specially, FilePath needs +// to do the same. Since Windows can use either / or \ as the separator, +// FilePath treats c://, c:\\, //, and \\ all equivalently. +// Reference: +// The Old New Thing, "Why is a drive letter permitted in front of UNC +// paths (sometimes)?", available at: +// http://blogs.msdn.com/oldnewthing/archive/2005/11/22/495740.aspx + +#ifndef BASE_FILES_FILE_PATH_H_ +#define BASE_FILES_FILE_PATH_H_ + +#include <stddef.h> +#include <string> +#include <vector> + +#include "base/base_export.h" +#include "base/compiler_specific.h" +#include "base/hash_tables.h" +#include "base/string16.h" +#include "base/string_piece.h" // For implicit conversions. +#include "build/build_config.h" + +// Windows-style drive letter support and pathname separator characters can be +// enabled and disabled independently, to aid testing. These #defines are +// here so that the same setting can be used in both the implementation and +// in the unit test. +#if defined(OS_WIN) +#define FILE_PATH_USES_DRIVE_LETTERS +#define FILE_PATH_USES_WIN_SEPARATORS +#endif // OS_WIN + +class Pickle; +class PickleIterator; + +namespace base { + +// An abstraction to isolate users from the differences between native +// pathnames on different platforms. +class BASE_EXPORT FilePath { + public: +#if defined(OS_POSIX) + // On most platforms, native pathnames are char arrays, and the encoding + // may or may not be specified. On Mac OS X, native pathnames are encoded + // in UTF-8. + typedef std::string StringType; +#elif defined(OS_WIN) + // On Windows, for Unicode-aware applications, native pathnames are wchar_t + // arrays encoded in UTF-16. + typedef std::wstring StringType; +#endif // OS_WIN + + typedef StringType::value_type CharType; + + // Null-terminated array of separators used to separate components in + // hierarchical paths. Each character in this array is a valid separator, + // but kSeparators[0] is treated as the canonical separator and will be used + // when composing pathnames. + static const CharType kSeparators[]; + + // A special path component meaning "this directory." + static const CharType kCurrentDirectory[]; + + // A special path component meaning "the parent directory." + static const CharType kParentDirectory[]; + + // The character used to identify a file extension. + static const CharType kExtensionSeparator; + + FilePath(); + FilePath(const FilePath& that); + explicit FilePath(const StringType& path); + ~FilePath(); + FilePath& operator=(const FilePath& that); + + bool operator==(const FilePath& that) const; + + bool operator!=(const FilePath& that) const; + + // Required for some STL containers and operations + bool operator<(const FilePath& that) const { + return path_ < that.path_; + } + + const StringType& value() const { return path_; } + + bool empty() const { return path_.empty(); } + + void clear() { path_.clear(); } + + // Returns true if |character| is in kSeparators. + static bool IsSeparator(CharType character); + + // Returns a vector of all of the components of the provided path. It is + // equivalent to calling DirName().value() on the path's root component, + // and BaseName().value() on each child component. + void GetComponents(std::vector<FilePath::StringType>* components) const; + + // Returns true if this FilePath is a strict parent of the |child|. Absolute + // and relative paths are accepted i.e. is /foo parent to /foo/bar and + // is foo parent to foo/bar. Does not convert paths to absolute, follow + // symlinks or directory navigation (e.g. ".."). A path is *NOT* its own + // parent. + bool IsParent(const FilePath& child) const; + + // If IsParent(child) holds, appends to path (if non-NULL) the + // relative path to child and returns true. For example, if parent + // holds "/Users/johndoe/Library/Application Support", child holds + // "/Users/johndoe/Library/Application Support/Google/Chrome/Default", and + // *path holds "/Users/johndoe/Library/Caches", then after + // parent.AppendRelativePath(child, path) is called *path will hold + // "/Users/johndoe/Library/Caches/Google/Chrome/Default". Otherwise, + // returns false. + bool AppendRelativePath(const FilePath& child, FilePath* path) const; + + // Returns a FilePath corresponding to the directory containing the path + // named by this object, stripping away the file component. If this object + // only contains one component, returns a FilePath identifying + // kCurrentDirectory. If this object already refers to the root directory, + // returns a FilePath identifying the root directory. + FilePath DirName() const WARN_UNUSED_RESULT; + + // Returns a FilePath corresponding to the last path component of this + // object, either a file or a directory. If this object already refers to + // the root directory, returns a FilePath identifying the root directory; + // this is the only situation in which BaseName will return an absolute path. + FilePath BaseName() const WARN_UNUSED_RESULT; + + // Returns ".jpg" for path "C:\pics\jojo.jpg", or an empty string if + // the file has no extension. If non-empty, Extension() will always start + // with precisely one ".". The following code should always work regardless + // of the value of path. + // new_path = path.RemoveExtension().value().append(path.Extension()); + // ASSERT(new_path == path.value()); + // NOTE: this is different from the original file_util implementation which + // returned the extension without a leading "." ("jpg" instead of ".jpg") + StringType Extension() const; + + // Returns "C:\pics\jojo" for path "C:\pics\jojo.jpg" + // NOTE: this is slightly different from the similar file_util implementation + // which returned simply 'jojo'. + FilePath RemoveExtension() const WARN_UNUSED_RESULT; + + // Inserts |suffix| after the file name portion of |path| but before the + // extension. Returns "" if BaseName() == "." or "..". + // Examples: + // path == "C:\pics\jojo.jpg" suffix == " (1)", returns "C:\pics\jojo (1).jpg" + // path == "jojo.jpg" suffix == " (1)", returns "jojo (1).jpg" + // path == "C:\pics\jojo" suffix == " (1)", returns "C:\pics\jojo (1)" + // path == "C:\pics.old\jojo" suffix == " (1)", returns "C:\pics.old\jojo (1)" + FilePath InsertBeforeExtension( + const StringType& suffix) const WARN_UNUSED_RESULT; + FilePath InsertBeforeExtensionASCII( + const base::StringPiece& suffix) const WARN_UNUSED_RESULT; + + // Adds |extension| to |file_name|. Returns the current FilePath if + // |extension| is empty. Returns "" if BaseName() == "." or "..". + FilePath AddExtension( + const StringType& extension) const WARN_UNUSED_RESULT; + + // Replaces the extension of |file_name| with |extension|. If |file_name| + // does not have an extension, then |extension| is added. If |extension| is + // empty, then the extension is removed from |file_name|. + // Returns "" if BaseName() == "." or "..". + FilePath ReplaceExtension( + const StringType& extension) const WARN_UNUSED_RESULT; + + // Returns true if the file path matches the specified extension. The test is + // case insensitive. Don't forget the leading period if appropriate. + bool MatchesExtension(const StringType& extension) const; + + // Returns a FilePath by appending a separator and the supplied path + // component to this object's path. Append takes care to avoid adding + // excessive separators if this object's path already ends with a separator. + // If this object's path is kCurrentDirectory, a new FilePath corresponding + // only to |component| is returned. |component| must be a relative path; + // it is an error to pass an absolute path. + FilePath Append(const StringType& component) const WARN_UNUSED_RESULT; + FilePath Append(const FilePath& component) const WARN_UNUSED_RESULT; + + // Although Windows StringType is std::wstring, since the encoding it uses for + // paths is well defined, it can handle ASCII path components as well. + // Mac uses UTF8, and since ASCII is a subset of that, it works there as well. + // On Linux, although it can use any 8-bit encoding for paths, we assume that + // ASCII is a valid subset, regardless of the encoding, since many operating + // system paths will always be ASCII. + FilePath AppendASCII(const base::StringPiece& component) + const WARN_UNUSED_RESULT; + + // Returns true if this FilePath contains an absolute path. On Windows, an + // absolute path begins with either a drive letter specification followed by + // a separator character, or with two separator characters. On POSIX + // platforms, an absolute path begins with a separator character. + bool IsAbsolute() const; + + // Returns a copy of this FilePath that does not end with a trailing + // separator. + FilePath StripTrailingSeparators() const WARN_UNUSED_RESULT; + + // Returns true if this FilePath contains any attempt to reference a parent + // directory (i.e. has a path component that is ".." + bool ReferencesParent() const; + + // Return a Unicode human-readable version of this path. + // Warning: you can *not*, in general, go from a display name back to a real + // path. Only use this when displaying paths to users, not just when you + // want to stuff a string16 into some other API. + string16 LossyDisplayName() const; + + // Return the path as ASCII, or the empty string if the path is not ASCII. + // This should only be used for cases where the FilePath is representing a + // known-ASCII filename. + std::string MaybeAsASCII() const; + + // Return the path as UTF-8. + // + // This function is *unsafe* as there is no way to tell what encoding is + // used in file names on POSIX systems other than Mac and Chrome OS, + // although UTF-8 is practically used everywhere these days. To mitigate + // the encoding issue, this function internally calls + // SysNativeMBToWide() on POSIX systems other than Mac and Chrome OS, + // per assumption that the current locale's encoding is used in file + // names, but this isn't a perfect solution. + // + // Once it becomes safe to to stop caring about non-UTF-8 file names, + // the SysNativeMBToWide() hack will be removed from the code, along + // with "Unsafe" in the function name. + std::string AsUTF8Unsafe() const; + + // Older Chromium code assumes that paths are always wstrings. + // This function converts wstrings to FilePaths, and is + // useful to smooth porting that old code to the FilePath API. + // It has "Hack" its name so people feel bad about using it. + // http://code.google.com/p/chromium/issues/detail?id=24672 + // + // If you are trying to be a good citizen and remove these, ask yourself: + // - Am I interacting with other Chrome code that deals with files? Then + // try to convert the API into using FilePath. + // - Am I interacting with OS-native calls? Then use value() to get at an + // OS-native string format. + // - Am I using well-known file names, like "config.ini"? Then use the + // ASCII functions (we require paths to always be supersets of ASCII). + // - Am I displaying a string to the user in some UI? Then use the + // LossyDisplayName() function, but keep in mind that you can't + // ever use the result of that again as a path. + static FilePath FromWStringHack(const std::wstring& wstring); + + // Returns a FilePath object from a path name in UTF-8. This function + // should only be used for cases where you are sure that the input + // string is UTF-8. + // + // Like AsUTF8Unsafe(), this function is unsafe. This function + // internally calls SysWideToNativeMB() on POSIX systems other than Mac + // and Chrome OS, to mitigate the encoding issue. See the comment at + // AsUTF8Unsafe() for details. + static FilePath FromUTF8Unsafe(const std::string& utf8); + + void WriteToPickle(Pickle* pickle) const; + bool ReadFromPickle(PickleIterator* iter); + + // Normalize all path separators to backslash on Windows + // (if FILE_PATH_USES_WIN_SEPARATORS is true), or do nothing on POSIX systems. + FilePath NormalizePathSeparators() const; + + // Compare two strings in the same way the file system does. + // Note that these always ignore case, even on file systems that are case- + // sensitive. If case-sensitive comparison is ever needed, add corresponding + // methods here. + // The methods are written as a static method so that they can also be used + // on parts of a file path, e.g., just the extension. + // CompareIgnoreCase() returns -1, 0 or 1 for less-than, equal-to and + // greater-than respectively. + static int CompareIgnoreCase(const StringType& string1, + const StringType& string2); + static bool CompareEqualIgnoreCase(const StringType& string1, + const StringType& string2) { + return CompareIgnoreCase(string1, string2) == 0; + } + static bool CompareLessIgnoreCase(const StringType& string1, + const StringType& string2) { + return CompareIgnoreCase(string1, string2) < 0; + } + +#if defined(OS_MACOSX) + // Returns the string in the special canonical decomposed form as defined for + // HFS, which is close to, but not quite, decomposition form D. See + // http://developer.apple.com/mac/library/technotes/tn/tn1150.html#UnicodeSubtleties + // for further comments. + // Returns the epmty string if the conversion failed. + static StringType GetHFSDecomposedForm(const FilePath::StringType& string); + + // Special UTF-8 version of FastUnicodeCompare. Cf: + // http://developer.apple.com/mac/library/technotes/tn/tn1150.html#StringComparisonAlgorithm + // IMPORTANT: The input strings must be in the special HFS decomposed form! + // (cf. above GetHFSDecomposedForm method) + static int HFSFastUnicodeCompare(const StringType& string1, + const StringType& string2); +#endif + + private: + // Remove trailing separators from this object. If the path is absolute, it + // will never be stripped any more than to refer to the absolute root + // directory, so "////" will become "/", not "". A leading pair of + // separators is never stripped, to support alternate roots. This is used to + // support UNC paths on Windows. + void StripTrailingSeparatorsInternal(); + + StringType path_; +}; + +} // namespace base + +// This is required by googletest to print a readable output on test failures. +BASE_EXPORT extern void PrintTo(const base::FilePath& path, std::ostream* out); + +// Macros for string literal initialization of FilePath::CharType[], and for +// using a FilePath::CharType[] in a printf-style format string. +#if defined(OS_POSIX) +#define FILE_PATH_LITERAL(x) x +#define PRFilePath "s" +#define PRFilePathLiteral "%s" +#elif defined(OS_WIN) +#define FILE_PATH_LITERAL(x) L ## x +#define PRFilePath "ls" +#define PRFilePathLiteral L"%ls" +#endif // OS_WIN + +// Provide a hash function so that hash_sets and maps can contain FilePath +// objects. +namespace BASE_HASH_NAMESPACE { +#if defined(COMPILER_GCC) + +template<> +struct hash<base::FilePath> { + size_t operator()(const base::FilePath& f) const { + return hash<base::FilePath::StringType>()(f.value()); + } +}; + +#elif defined(COMPILER_MSVC) + +inline size_t hash_value(const base::FilePath& f) { + return hash_value(f.value()); +} + +#endif // COMPILER + +} // namespace BASE_HASH_NAMESPACE + +#endif // BASE_FILES_FILE_PATH_H_ diff --git a/base/file_path_unittest.cc b/base/files/file_path_unittest.cc index ba6c8a2..9a690a9 100644 --- a/base/file_path_unittest.cc +++ b/base/files/file_path_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/base/files/file_path_watcher.h b/base/files/file_path_watcher.h index b0d55a2..896601c 100644 --- a/base/files/file_path_watcher.h +++ b/base/files/file_path_watcher.h @@ -10,7 +10,7 @@ #include "base/base_export.h" #include "base/basictypes.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/message_loop_proxy.h" diff --git a/base/files/file_path_watcher_browsertest.cc b/base/files/file_path_watcher_browsertest.cc index 9129d91..48d8d0d 100644 --- a/base/files/file_path_watcher_browsertest.cc +++ b/base/files/file_path_watcher_browsertest.cc @@ -17,8 +17,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/compiler_specific.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/message_loop_proxy.h" diff --git a/base/files/file_path_watcher_linux.cc b/base/files/file_path_watcher_linux.cc index b4a714a..074eee3 100644 --- a/base/files/file_path_watcher_linux.cc +++ b/base/files/file_path_watcher_linux.cc @@ -17,8 +17,8 @@ #include <vector> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/hash_tables.h" #include "base/lazy_instance.h" #include "base/location.h" diff --git a/base/files/file_path_watcher_win.cc b/base/files/file_path_watcher_win.cc index 2c439ca..2452922 100644 --- a/base/files/file_path_watcher_win.cc +++ b/base/files/file_path_watcher_win.cc @@ -5,8 +5,8 @@ #include "base/files/file_path_watcher.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/message_loop_proxy.h" diff --git a/base/files/file_util_proxy.h b/base/files/file_util_proxy.h index 8cbdfcb..d155355 100644 --- a/base/files/file_util_proxy.h +++ b/base/files/file_util_proxy.h @@ -7,8 +7,8 @@ #include "base/base_export.h" #include "base/callback_forward.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/platform_file.h" diff --git a/base/files/important_file_writer.cc b/base/files/important_file_writer.cc index 4a7bdf9..e58dcf3 100644 --- a/base/files/important_file_writer.cc +++ b/base/files/important_file_writer.cc @@ -10,12 +10,12 @@ #include "base/bind.h" #include "base/critical_closure.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" -#include "base/task_runner.h" #include "base/metrics/histogram.h" #include "base/strings/string_number_conversions.h" +#include "base/task_runner.h" #include "base/threading/thread.h" #include "base/time.h" diff --git a/base/files/important_file_writer.h b/base/files/important_file_writer.h index 9bc8f07..190a60b 100644 --- a/base/files/important_file_writer.h +++ b/base/files/important_file_writer.h @@ -9,7 +9,7 @@ #include "base/base_export.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/threading/non_thread_safe.h" #include "base/time.h" diff --git a/base/files/important_file_writer_unittest.cc b/base/files/important_file_writer_unittest.cc index 53c642b..8133782 100644 --- a/base/files/important_file_writer_unittest.cc +++ b/base/files/important_file_writer_unittest.cc @@ -5,8 +5,8 @@ #include "base/files/important_file_writer.h" #include "base/compiler_specific.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/logging.h" #include "base/message_loop.h" diff --git a/base/files/scoped_temp_dir.h b/base/files/scoped_temp_dir.h index 641e7ef..5f63e09 100644 --- a/base/files/scoped_temp_dir.h +++ b/base/files/scoped_temp_dir.h @@ -16,7 +16,7 @@ // intervening calls to Delete or Take, or the calls will fail. #include "base/base_export.h" -#include "base/file_path.h" +#include "base/files/file_path.h" namespace base { diff --git a/base/i18n/file_util_icu.cc b/base/i18n/file_util_icu.cc index 2f45efc..f023a4f 100644 --- a/base/i18n/file_util_icu.cc +++ b/base/i18n/file_util_icu.cc @@ -6,7 +6,7 @@ #include "base/i18n/file_util_icu.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/icu_string_conversions.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/base/i18n/file_util_icu.h b/base/i18n/file_util_icu.h index cf22e7c..024a927 100644 --- a/base/i18n/file_util_icu.h +++ b/base/i18n/file_util_icu.h @@ -7,7 +7,7 @@ // File utilities that use the ICU library go in this file. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/base_i18n_export.h" #include "base/string16.h" diff --git a/base/i18n/icu_util.cc b/base/i18n/icu_util.cc index 25fe8c1..fed1176 100644 --- a/base/i18n/icu_util.cc +++ b/base/i18n/icu_util.cc @@ -12,8 +12,8 @@ #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/string_util.h" diff --git a/base/i18n/rtl.cc b/base/i18n/rtl.cc index 821548f..1b7dd8b 100644 --- a/base/i18n/rtl.cc +++ b/base/i18n/rtl.cc @@ -4,7 +4,7 @@ #include "base/i18n/rtl.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/string_util.h" #include "base/strings/sys_string_conversions.h" diff --git a/base/i18n/rtl_unittest.cc b/base/i18n/rtl_unittest.cc index ed661a9..0cc334e 100644 --- a/base/i18n/rtl_unittest.cc +++ b/base/i18n/rtl_unittest.cc @@ -6,7 +6,7 @@ #include <algorithm> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" diff --git a/base/json/json_file_value_serializer.h b/base/json/json_file_value_serializer.h index 3869e5e..81904df 100644 --- a/base/json/json_file_value_serializer.h +++ b/base/json/json_file_value_serializer.h @@ -9,7 +9,7 @@ #include "base/base_export.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/values.h" class BASE_EXPORT JSONFileValueSerializer : public base::ValueSerializer { diff --git a/base/json/json_string_value_serializer.h b/base/json/json_string_value_serializer.h index e333dc6..71bd152 100644 --- a/base/json/json_string_value_serializer.h +++ b/base/json/json_string_value_serializer.h @@ -9,7 +9,7 @@ #include "base/base_export.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/values.h" class BASE_EXPORT JSONStringValueSerializer : public base::ValueSerializer { diff --git a/base/mac/bundle_locations.h b/base/mac/bundle_locations.h index 1d96539..276290b 100644 --- a/base/mac/bundle_locations.h +++ b/base/mac/bundle_locations.h @@ -6,7 +6,7 @@ #define BASE_MAC_BUNDLE_LOCATIONS_H_ #include "base/base_export.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #if defined(__OBJC__) #import <Foundation/Foundation.h> diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm index 1217402..71e8942 100644 --- a/base/mac/foundation_util.mm +++ b/base/mac/foundation_util.mm @@ -7,7 +7,7 @@ #include <stdlib.h> #include <string.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/mac/bundle_locations.h" #include "base/mac/mac_logging.h" diff --git a/base/mac/foundation_util_unittest.mm b/base/mac/foundation_util_unittest.mm index 6fb85d8..fc7dd09 100644 --- a/base/mac/foundation_util_unittest.mm +++ b/base/mac/foundation_util_unittest.mm @@ -5,7 +5,7 @@ #include "base/mac/foundation_util.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/scoped_cftyperef.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/mac/mac_util.mm b/base/mac/mac_util.mm index 5a46200..d3594a4 100644 --- a/base/mac/mac_util.mm +++ b/base/mac/mac_util.mm @@ -12,7 +12,7 @@ #include <sys/utsname.h> #include <sys/xattr.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/mac/bundle_locations.h" #include "base/mac/foundation_util.h" diff --git a/base/mac/mac_util_unittest.mm b/base/mac/mac_util_unittest.mm index 3182948..44cc5ec 100644 --- a/base/mac/mac_util_unittest.mm +++ b/base/mac/mac_util_unittest.mm @@ -6,8 +6,8 @@ #include "base/mac/mac_util.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/mac/foundation_util.h" #include "base/mac/scoped_cftyperef.h" diff --git a/base/native_library_mac.mm b/base/native_library_mac.mm index daaaeb0..eec586b 100644 --- a/base/native_library_mac.mm +++ b/base/native_library_mac.mm @@ -6,8 +6,8 @@ #include <dlfcn.h> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/mac/scoped_cftyperef.h" #include "base/string_util.h" #include "base/threading/thread_restrictions.h" diff --git a/base/native_library_posix.cc b/base/native_library_posix.cc index 4b82ff4..9b694e1 100644 --- a/base/native_library_posix.cc +++ b/base/native_library_posix.cc @@ -6,7 +6,7 @@ #include <dlfcn.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" diff --git a/base/nix/xdg_util.cc b/base/nix/xdg_util.cc index 10cbcaa..b3caf2a 100644 --- a/base/nix/xdg_util.cc +++ b/base/nix/xdg_util.cc @@ -7,8 +7,8 @@ #include <string> #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/third_party/xdg_user_dirs/xdg_user_dir_lookup.h" namespace { diff --git a/base/path_service.cc b/base/path_service.cc index cb34d28..5b362ab 100644 --- a/base/path_service.cc +++ b/base/path_service.cc @@ -10,8 +10,8 @@ #include <shlobj.h> #endif -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/hash_tables.h" #include "base/lazy_instance.h" #include "base/logging.h" diff --git a/base/path_service_unittest.cc b/base/path_service_unittest.cc index 7c0f036..8ae4178 100644 --- a/base/path_service_unittest.cc +++ b/base/path_service_unittest.cc @@ -5,8 +5,8 @@ #include "base/path_service.h" #include "base/basictypes.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/string_util.h" #include "build/build_config.h" diff --git a/base/perftimer.cc b/base/perftimer.cc index 94158c8..9ab7c6b 100644 --- a/base/perftimer.cc +++ b/base/perftimer.cc @@ -8,8 +8,8 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" static FILE* perf_log_file = NULL; diff --git a/base/platform_file.h b/base/platform_file.h index 1ac40fcd..48d1806 100644 --- a/base/platform_file.h +++ b/base/platform_file.h @@ -14,7 +14,7 @@ #include "base/base_export.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/time.h" namespace base { diff --git a/base/platform_file_posix.cc b/base/platform_file_posix.cc index d89a1b0..ee06055 100644 --- a/base/platform_file_posix.cc +++ b/base/platform_file_posix.cc @@ -9,7 +9,7 @@ #include <sys/stat.h> #include <unistd.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/threading/thread_restrictions.h" diff --git a/base/platform_file_win.cc b/base/platform_file_win.cc index 7c72f9e..b88fe9c 100644 --- a/base/platform_file_win.cc +++ b/base/platform_file_win.cc @@ -4,7 +4,7 @@ #include "base/platform_file.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/threading/thread_restrictions.h" diff --git a/base/prefs/json_pref_store.h b/base/prefs/json_pref_store.h index 479d706..7956764 100644 --- a/base/prefs/json_pref_store.h +++ b/base/prefs/json_pref_store.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/important_file_writer.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop_proxy.h" diff --git a/base/prefs/pref_registry_simple.cc b/base/prefs/pref_registry_simple.cc index 792ff19..cc3f1f0 100644 --- a/base/prefs/pref_registry_simple.cc +++ b/base/prefs/pref_registry_simple.cc @@ -4,7 +4,7 @@ #include "base/prefs/pref_registry_simple.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_number_conversions.h" #include "base/values.h" diff --git a/base/prefs/pref_service.cc b/base/prefs/pref_service.cc index 457778f..67ab898 100644 --- a/base/prefs/pref_service.cc +++ b/base/prefs/pref_service.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" diff --git a/base/prefs/public/pref_member.h b/base/prefs/public/pref_member.h index 7e27912..4c82735 100644 --- a/base/prefs/public/pref_member.h +++ b/base/prefs/public/pref_member.h @@ -30,7 +30,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/message_loop_proxy.h" diff --git a/base/process_util.h b/base/process_util.h index b8ad122..0df3b92 100644 --- a/base/process_util.h +++ b/base/process_util.h @@ -37,7 +37,7 @@ typedef struct _malloc_zone_t malloc_zone_t; #include <vector> #include "base/base_export.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process.h" #if defined(OS_POSIX) diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc index 0310e9c..d109fba 100644 --- a/base/process_util_unittest.cc +++ b/base/process_util_unittest.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/debug/alias.h" #include "base/debug/stack_trace.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" @@ -25,13 +25,13 @@ #include "testing/multiprocess_func_list.h" #if defined(OS_LINUX) -#include <malloc.h> #include <glib.h> +#include <malloc.h> #include <sched.h> #endif #if defined(OS_POSIX) -#include <errno.h> #include <dlfcn.h> +#include <errno.h> #include <fcntl.h> #include <signal.h> #include <sys/resource.h> diff --git a/base/scoped_native_library_unittest.cc b/base/scoped_native_library_unittest.cc index a4fde6a..c120555 100644 --- a/base/scoped_native_library_unittest.cc +++ b/base/scoped_native_library_unittest.cc @@ -4,7 +4,7 @@ #include "base/scoped_native_library.h" #if defined(OS_WIN) -#include "base/file_path.h" +#include "base/files/file_path.h" #endif #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/sys_info.h b/base/sys_info.h index 5af5d43..38462ed 100644 --- a/base/sys_info.h +++ b/base/sys_info.h @@ -9,7 +9,7 @@ #include "base/base_export.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "build/build_config.h" namespace base { diff --git a/base/sys_info_chromeos.cc b/base/sys_info_chromeos.cc index 78b8bd5..ef7b3dc 100644 --- a/base/sys_info_chromeos.cc +++ b/base/sys_info_chromeos.cc @@ -5,8 +5,8 @@ #include "base/sys_info.h" #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/string_piece.h" #include "base/strings/string_number_conversions.h" diff --git a/base/sys_info_win.cc b/base/sys_info_win.cc index 98d2f7c..af0ce7e 100644 --- a/base/sys_info_win.cc +++ b/base/sys_info_win.cc @@ -6,7 +6,7 @@ #include <windows.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/stringprintf.h" diff --git a/base/test/perf_test_suite.cc b/base/test/perf_test_suite.cc index 232766a..7276c14 100644 --- a/base/test/perf_test_suite.cc +++ b/base/test/perf_test_suite.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/debug/debugger.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/perftimer.h" #include "base/process_util.h" diff --git a/base/test/test_file_util.h b/base/test/test_file_util.h index e97c0e5..8d1be1c 100644 --- a/base/test/test_file_util.h +++ b/base/test/test_file_util.h @@ -10,7 +10,7 @@ #include <string> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" namespace base { class FilePath; diff --git a/base/test/test_file_util_linux.cc b/base/test/test_file_util_linux.cc index 958fa81..7eb0533 100644 --- a/base/test/test_file_util_linux.cc +++ b/base/test/test_file_util_linux.cc @@ -9,7 +9,7 @@ #include <sys/types.h> #include <unistd.h> -#include "base/file_path.h" +#include "base/files/file_path.h" namespace file_util { diff --git a/base/test/test_file_util_posix.cc b/base/test/test_file_util_posix.cc index f538bc1..6be1c82 100644 --- a/base/test/test_file_util_posix.cc +++ b/base/test/test_file_util_posix.cc @@ -11,8 +11,8 @@ #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" diff --git a/base/test/test_file_util_win.cc b/base/test/test_file_util_win.cc index 9b234e3..8d28aef 100644 --- a/base/test/test_file_util_win.cc +++ b/base/test/test_file_util_win.cc @@ -4,14 +4,14 @@ #include "base/test/test_file_util.h" +#include <windows.h> #include <aclapi.h> #include <shlwapi.h> -#include <windows.h> #include <vector> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/strings/string_split.h" #include "base/threading/platform_thread.h" diff --git a/base/test/test_shortcut_win.cc b/base/test/test_shortcut_win.cc index 1a0d280..ec6300a 100644 --- a/base/test/test_shortcut_win.cc +++ b/base/test/test_shortcut_win.cc @@ -8,7 +8,7 @@ #include <shlobj.h> #include <propkey.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "base/utf_string_conversions.h" #include "base/win/scoped_comptr.h" diff --git a/base/test/test_shortcut_win.h b/base/test/test_shortcut_win.h index ef75713..4c42935 100644 --- a/base/test/test_shortcut_win.h +++ b/base/test/test_shortcut_win.h @@ -5,7 +5,7 @@ #ifndef BASE_TEST_TEST_SHORTCUT_WIN_H_ #define BASE_TEST_TEST_SHORTCUT_WIN_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/win/shortcut.h" // Windows shortcut functions used only by tests. diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc index cd7875b..a55b8e0 100644 --- a/base/test/test_suite.cc +++ b/base/test/test_suite.cc @@ -11,7 +11,7 @@ #include "base/debug/debug_on_start_win.h" #include "base/debug/debugger.h" #include "base/debug/stack_trace.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/icu_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/base/test/test_support_android.cc b/base/test/test_support_android.cc index b87c073..64da18a 100644 --- a/base/test/test_support_android.cc +++ b/base/test/test_support_android.cc @@ -6,7 +6,7 @@ #include <string.h> #include "base/android/path_utils.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/singleton.h" #include "base/message_loop.h" diff --git a/base/value_conversions.cc b/base/value_conversions.cc index 08a6b3c..b9c831e 100644 --- a/base/value_conversions.cc +++ b/base/value_conversions.cc @@ -4,7 +4,7 @@ #include "base/value_conversions.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/values.h" diff --git a/base/win/event_trace_consumer_unittest.cc b/base/win/event_trace_consumer_unittest.cc index 9e9297c..be8e5f4 100644 --- a/base/win/event_trace_consumer_unittest.cc +++ b/base/win/event_trace_consumer_unittest.cc @@ -10,8 +10,8 @@ #include <objbase.h> #include "base/basictypes.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/logging.h" #include "base/process.h" diff --git a/base/win/event_trace_controller_unittest.cc b/base/win/event_trace_controller_unittest.cc index 82c4106..2ab9ef0 100644 --- a/base/win/event_trace_controller_unittest.cc +++ b/base/win/event_trace_controller_unittest.cc @@ -7,8 +7,8 @@ #include <objbase.h> #include <initguid.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/logging.h" #include "base/process.h" diff --git a/base/win/metro.h b/base/win/metro.h index 8c7f3f9..1aa07fb 100644 --- a/base/win/metro.h +++ b/base/win/metro.h @@ -10,7 +10,7 @@ #include "base/base_export.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" namespace base { diff --git a/base/win/shortcut.h b/base/win/shortcut.h index 52ac1a7..3ecd84c 100644 --- a/base/win/shortcut.h +++ b/base/win/shortcut.h @@ -7,8 +7,8 @@ #include <windows.h> +#include "base/files/file_path.h" #include "base/logging.h" -#include "base/file_path.h" #include "base/string16.h" namespace base { diff --git a/base/win/shortcut_unittest.cc b/base/win/shortcut_unittest.cc index 14aab29..56f3b4a 100644 --- a/base/win/shortcut_unittest.cc +++ b/base/win/shortcut_unittest.cc @@ -6,8 +6,8 @@ #include <string> -#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/test/test_file_util.h" #include "base/test/test_shortcut_win.h" diff --git a/cc/layer_tree_host_perftest.cc b/cc/layer_tree_host_perftest.cc index c8e82ab..7682593 100644 --- a/cc/layer_tree_host_perftest.cc +++ b/cc/layer_tree_host_perftest.cc @@ -4,8 +4,8 @@ #include "cc/layer_tree_host.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string_piece.h" #include "cc/content_layer.h" diff --git a/cc/test/paths.cc b/cc/test/paths.cc index b921cca..2aa7aa7 100644 --- a/cc/test/paths.cc +++ b/cc/test/paths.cc @@ -4,8 +4,8 @@ #include "cc/test/paths.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" namespace cc { diff --git a/cc/test/pixel_test_utils.h b/cc/test/pixel_test_utils.h index 5f8db47..29dad87 100644 --- a/cc/test/pixel_test_utils.h +++ b/cc/test/pixel_test_utils.h @@ -5,7 +5,7 @@ #ifndef CC_TEST_PIXEL_TEST_UTILS_H_ #define CC_TEST_PIXEL_TEST_UTILS_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" class SkBitmap; diff --git a/chrome/app/app_mode_loader_mac.mm b/chrome/app/app_mode_loader_mac.mm index ebcc842..56f99ca 100644 --- a/chrome/app/app_mode_loader_mac.mm +++ b/chrome/app/app_mode_loader_mac.mm @@ -13,8 +13,8 @@ #include <CoreFoundation/CoreFoundation.h> #import <Foundation/Foundation.h> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/mac/foundation_util.h" #include "base/mac/scoped_nsautorelease_pool.h" diff --git a/chrome/app/breakpad_linux.cc b/chrome/app/breakpad_linux.cc index 374b929..d507095 100644 --- a/chrome/app/breakpad_linux.cc +++ b/chrome/app/breakpad_linux.cc @@ -15,8 +15,8 @@ #include <sys/socket.h> #include <sys/time.h> #include <sys/types.h> -#include <sys/wait.h> #include <sys/uio.h> +#include <sys/wait.h> #include <time.h> #include <unistd.h> @@ -24,7 +24,7 @@ #include <string> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/linux_util.h" #include "base/path_service.h" #include "base/platform_file.h" diff --git a/chrome/app/breakpad_mac.mm b/chrome/app/breakpad_mac.mm index 3ab6da3..e7f8ae3 100644 --- a/chrome/app/breakpad_mac.mm +++ b/chrome/app/breakpad_mac.mm @@ -12,8 +12,8 @@ #import "base/basictypes.h" #include "base/command_line.h" #include "base/debug/crash_logging.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #import "base/logging.h" #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" diff --git a/chrome/app/chrome_main_app_mode_mac.mm b/chrome/app/chrome_main_app_mode_mac.mm index 99d0dcc..d102fc8 100644 --- a/chrome/app/chrome_main_app_mode_mac.mm +++ b/chrome/app/chrome_main_app_mode_mac.mm @@ -8,7 +8,7 @@ // those app bundles. #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/mac/bundle_locations.h" #include "base/mac/foundation_util.h" diff --git a/chrome/app/chrome_main_mac.mm b/chrome/app/chrome_main_mac.mm index 6fd8783..662c93f 100644 --- a/chrome/app/chrome_main_mac.mm +++ b/chrome/app/chrome_main_mac.mm @@ -9,7 +9,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #import "base/mac/bundle_locations.h" #import "base/mac/foundation_util.h" diff --git a/chrome/app/nacl_fork_delegate_linux.cc b/chrome/app/nacl_fork_delegate_linux.cc index 2cb0fef..c16603d 100644 --- a/chrome/app/nacl_fork_delegate_linux.cc +++ b/chrome/app/nacl_fork_delegate_linux.cc @@ -13,7 +13,7 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/posix/eintr_wrapper.h" diff --git a/chrome/browser/android/crash_dump_manager.h b/chrome/browser/android/crash_dump_manager.h index 6cfe497..7cf52d8 100644 --- a/chrome/browser/android/crash_dump_manager.h +++ b/chrome/browser/android/crash_dump_manager.h @@ -7,7 +7,7 @@ #include <map> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/platform_file.h" #include "base/process.h" #include "base/synchronization/lock.h" diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 93d0d41..8b78e26 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -7,7 +7,7 @@ #include "base/auto_reset.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/foundation_util.h" #include "base/mac/mac_util.h" #include "base/message_loop.h" diff --git a/chrome/browser/auto_launch_trial.cc b/chrome/browser/auto_launch_trial.cc index 137b012..5339314 100644 --- a/chrome/browser/auto_launch_trial.cc +++ b/chrome/browser/auto_launch_trial.cc @@ -4,13 +4,13 @@ #include "chrome/browser/auto_launch_trial.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/string_util.h" #include "chrome/browser/first_run/first_run.h" -#include "chrome/installer/util/master_preferences_constants.h" #include "chrome/installer/util/master_preferences.h" +#include "chrome/installer/util/master_preferences_constants.h" const char kAutoLaunchTrialName[] = "AutoLaunchExperiment"; const char kAutoLaunchTrialAutoLaunchGroup[] = "AutoLaunching"; diff --git a/chrome/browser/autofill/autofill_merge_unittest.cc b/chrome/browser/autofill/autofill_merge_unittest.cc index ca90c89..3c6a184 100644 --- a/chrome/browser/autofill/autofill_merge_unittest.cc +++ b/chrome/browser/autofill/autofill_merge_unittest.cc @@ -5,7 +5,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_common_test.h" diff --git a/chrome/browser/autofill/data_driven_test.h b/chrome/browser/autofill/data_driven_test.h index 23f0483..ec6e9ac 100644 --- a/chrome/browser/autofill/data_driven_test.h +++ b/chrome/browser/autofill/data_driven_test.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" // A convenience class for implementing data-driven tests. Subclassers need only diff --git a/chrome/browser/autofill/form_structure_browsertest.cc b/chrome/browser/autofill/form_structure_browsertest.cc index 438b0fb..6751675 100644 --- a/chrome/browser/autofill/form_structure_browsertest.cc +++ b/chrome/browser/autofill/form_structure_browsertest.cc @@ -4,7 +4,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_manager.h" diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 2a8e07e..08a7cc7 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -10,7 +10,7 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/debug/trace_event.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h" #include "base/json/json_writer.h" diff --git a/chrome/browser/automation/automation_tab_helper_browsertest.cc b/chrome/browser/automation/automation_tab_helper_browsertest.cc index 2125b9e..ec27758 100644 --- a/chrome/browser/automation/automation_tab_helper_browsertest.cc +++ b/chrome/browser/automation/automation_tab_helper_browsertest.cc @@ -4,7 +4,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string16.h" #include "base/stringprintf.h" diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 51edc54..b1af9f2 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/json/string_escape.h" diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc index 6718908..278c2d2 100644 --- a/chrome/browser/background/background_application_list_model_unittest.cc +++ b/chrome/browser/background/background_application_list_model_unittest.cc @@ -10,8 +10,8 @@ #include "chrome/browser/background/background_application_list_model.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/stl_util.h" diff --git a/chrome/browser/background/background_mode_manager_gtk.cc b/chrome/browser/background/background_mode_manager_gtk.cc index c61a302..8dd75f3 100644 --- a/chrome/browser/background/background_mode_manager_gtk.cc +++ b/chrome/browser/background/background_mode_manager_gtk.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/nix/xdg_util.h" #include "chrome/browser/background/background_mode_manager.h" diff --git a/chrome/browser/background/background_mode_manager_win.cc b/chrome/browser/background/background_mode_manager_win.cc index 6c4eabf..9ce190e 100644 --- a/chrome/browser/background/background_mode_manager_win.cc +++ b/chrome/browser/background/background_mode_manager_win.cc @@ -5,7 +5,7 @@ #include "base/base_paths.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/bookmarks/bookmark_codec_unittest.cc b/chrome/browser/bookmarks/bookmark_codec_unittest.cc index 7ae6cab..c3fded1 100644 --- a/chrome/browser/bookmarks/bookmark_codec_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_codec_unittest.cc @@ -2,8 +2,8 @@ // 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/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/browser/bookmarks/bookmark_html_writer.h b/chrome/browser/bookmarks/bookmark_html_writer.h index 47d004e..5f588ae 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.h +++ b/chrome/browser/bookmarks/bookmark_html_writer.h @@ -9,7 +9,7 @@ #include <map> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" #include "chrome/common/cancelable_task_tracker.h" diff --git a/chrome/browser/bookmarks/bookmark_node_data.h b/chrome/browser/bookmarks/bookmark_node_data.h index 8bf61a62..690f6c3 100644 --- a/chrome/browser/bookmarks/bookmark_node_data.h +++ b/chrome/browser/bookmarks/bookmark_node_data.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm b/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm index c32ee8e..faabc7f 100644 --- a/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm +++ b/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm @@ -6,7 +6,7 @@ #import <Cocoa/Cocoa.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/bookmarks/bookmark_storage.cc b/chrome/browser/bookmarks/bookmark_storage.cc index d42a51a..2be831a 100644 --- a/chrome/browser/bookmarks/bookmark_storage.cc +++ b/chrome/browser/bookmarks/bookmark_storage.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/json/json_string_value_serializer.h" #include "base/metrics/histogram.h" diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 1ade098..83581a1 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -7,7 +7,7 @@ #include <utility> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/case_conversion.h" #include "base/i18n/string_search.h" #include "base/metrics/histogram.h" diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index cb7d186..18be43c 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/prefs/pref_registry_simple.h" diff --git a/chrome/browser/browser_util_win.cc b/chrome/browser/browser_util_win.cc index 2c32df0..4725493 100644 --- a/chrome/browser/browser_util_win.cc +++ b/chrome/browser/browser_util_win.cc @@ -10,7 +10,7 @@ #include <string> #include "base/base_paths.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" namespace browser_util { diff --git a/chrome/browser/browsing_data/browsing_data_file_system_helper.h b/chrome/browser/browsing_data/browsing_data_file_system_helper.h index 1178c63f..633661d 100644 --- a/chrome/browser/browsing_data/browsing_data_file_system_helper.h +++ b/chrome/browser/browsing_data/browsing_data_file_system_helper.h @@ -10,7 +10,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h b/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h index 35a2f1f..967c320 100644 --- a/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h +++ b/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h @@ -11,7 +11,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "base/time.h" diff --git a/chrome/browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc index da2288f..3dc6e2a 100644 --- a/chrome/browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc +++ b/chrome/browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/browsing_data/browsing_data_local_storage_helper.h b/chrome/browser/browsing_data/browsing_data_local_storage_helper.h index 78a519c..c41c7a7 100644 --- a/chrome/browser/browsing_data/browsing_data_local_storage_helper.h +++ b/chrome/browser/browsing_data/browsing_data_local_storage_helper.h @@ -11,12 +11,12 @@ #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "base/time.h" -#include "content/public/browser/dom_storage_context.h" #include "chrome/common/url_constants.h" +#include "content/public/browser/dom_storage_context.h" #include "googleurl/src/gurl.h" class Profile; diff --git a/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc index 3dd8319..b123b89 100644 --- a/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc +++ b/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/test/thread_test_helper.h" #include "base/threading/sequenced_worker_pool.h" diff --git a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc index 99a6a05..c3ffb2a 100644 --- a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc +++ b/chrome/browser/browsing_data/browsing_data_remover_browsertest.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/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" #include "chrome/browser/browsing_data/browsing_data_helper.h" diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc index 6301d78..277a4a1 100644 --- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/platform_file.h" #include "base/prefs/testing_pref_service.h" diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc index ffebe9d..179d050 100644 --- a/chrome/browser/captive_portal/captive_portal_browsertest.cc +++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index e468913..995060b 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -16,8 +16,8 @@ #include "base/command_line.h" #include "base/cpu.h" #include "base/debug/trace_event.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/path_service.h" diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm index c953292..9130e2e 100644 --- a/chrome/browser/chrome_browser_main_mac.mm +++ b/chrome/browser/chrome_browser_main_mac.mm @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/debug/debugger.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #include "base/memory/scoped_nsobject.h" diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc index 6dfb69a..cbe174a 100644 --- a/chrome/browser/chrome_browser_main_win.cc +++ b/chrome/browser/chrome_browser_main_win.cc @@ -11,7 +11,7 @@ #include "base/command_line.h" #include "base/environment.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/rtl.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/browser/chrome_to_mobile_service.h b/chrome/browser/chrome_to_mobile_service.h index 85c205b..bc29971 100644 --- a/chrome/browser/chrome_to_mobile_service.h +++ b/chrome/browser/chrome_to_mobile_service.h @@ -12,7 +12,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "base/string16.h" diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_data.h b/chrome/browser/chromeos/app_mode/kiosk_app_data.h index 5be6ff2..27e482dd 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_data.h +++ b/chrome/browser/chromeos/app_mode/kiosk_app_data.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/extensions/webstore_data_fetcher_delegate.h" diff --git a/chrome/browser/chromeos/boot_times_loader.cc b/chrome/browser/chromeos/boot_times_loader.cc index e39005e..e793013 100644 --- a/chrome/browser/chromeos/boot_times_loader.cc +++ b/chrome/browser/chromeos/boot_times_loader.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/message_loop.h" diff --git a/chrome/browser/chromeos/contacts/contact_database.h b/chrome/browser/chromeos/contacts/contact_database.h index 053f8da..d4074df 100644 --- a/chrome/browser/chromeos/contacts/contact_database.h +++ b/chrome/browser/chromeos/contacts/contact_database.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" -#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/scoped_vector.h" diff --git a/chrome/browser/chromeos/contacts/contact_database_unittest.cc b/chrome/browser/chromeos/contacts/contact_database_unittest.cc index 96e2768..c32cad0 100644 --- a/chrome/browser/chromeos/contacts/contact_database_unittest.cc +++ b/chrome/browser/chromeos/contacts/contact_database_unittest.cc @@ -7,8 +7,8 @@ #include <string> #include "base/bind.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/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" diff --git a/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc b/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc index c666de891..38bead4 100644 --- a/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc +++ b/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc @@ -5,8 +5,8 @@ #include "chrome/browser/chromeos/contacts/gdata_contacts_service.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/stringprintf.h" #include "base/time.h" diff --git a/chrome/browser/chromeos/contacts/google_contact_store.cc b/chrome/browser/chromeos/contacts/google_contact_store.cc index ee46ac1..ba2bf9d 100644 --- a/chrome/browser/chromeos/contacts/google_contact_store.cc +++ b/chrome/browser/chromeos/contacts/google_contact_store.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/contacts/contact.pb.h" diff --git a/chrome/browser/chromeos/cros/burn_library.h b/chrome/browser/chromeos/cros/burn_library.h index 202178e..de0392e 100644 --- a/chrome/browser/chromeos/cros/burn_library.h +++ b/chrome/browser/chromeos/cros/burn_library.h @@ -8,7 +8,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" struct ImageBurnStatus { ImageBurnStatus() : amount_burnt(0), total_size(0) { diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc index f0a5b6b..ad0447d 100644 --- a/chrome/browser/chromeos/customization_document.cc +++ b/chrome/browser/chromeos/customization_document.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/prefs/pref_registry_simple.h" diff --git a/chrome/browser/chromeos/drive/drive_cache.h b/chrome/browser/chromeos/drive/drive_cache.h index d3c867c..ec8cc23 100644 --- a/chrome/browser/chromeos/drive/drive_cache.h +++ b/chrome/browser/chromeos/drive/drive_cache.h @@ -9,7 +9,7 @@ #include <vector> #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" diff --git a/chrome/browser/chromeos/drive/drive_cache_metadata.h b/chrome/browser/chromeos/drive/drive_cache_metadata.h index ec6471b..1e06866 100644 --- a/chrome/browser/chromeos/drive/drive_cache_metadata.h +++ b/chrome/browser/chromeos/drive/drive_cache_metadata.h @@ -6,11 +6,11 @@ #define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_CACHE_METADATA_H_ #include <map> -#include <vector> #include <string> +#include <vector> #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/chromeos/drive/drive_feed_processor.h b/chrome/browser/chromeos/drive/drive_feed_processor.h index 54a9353..e4de483 100644 --- a/chrome/browser/chromeos/drive/drive_feed_processor.h +++ b/chrome/browser/chromeos/drive/drive_feed_processor.h @@ -10,7 +10,7 @@ #include <string> #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/chromeos/drive/drive_file_system_unittest.cc b/chrome/browser/chromeos/drive/drive_file_system_unittest.cc index 4b376a5..8dd3ff3 100644 --- a/chrome/browser/chromeos/drive/drive_file_system_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_file_system_unittest.cc @@ -8,8 +8,8 @@ #include <vector> #include "base/bind.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/json/json_file_value_serializer.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/chromeos/drive/drive_file_system_util.cc b/chrome/browser/chromeos/drive/drive_file_system_util.cc index 80f798a..5f8d19f 100644 --- a/chrome/browser/chromeos/drive/drive_file_system_util.cc +++ b/chrome/browser/chromeos/drive/drive_file_system_util.cc @@ -11,8 +11,8 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/message_loop_proxy.h" diff --git a/chrome/browser/chromeos/drive/drive_file_system_util_unittest.cc b/chrome/browser/chromeos/drive/drive_file_system_util_unittest.cc index 4c90b24..2e4922f 100644 --- a/chrome/browser/chromeos/drive/drive_file_system_util_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_file_system_util_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/chromeos/drive/drive_file_system_util.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/drive_resource_metadata.h b/chrome/browser/chromeos/drive/drive_resource_metadata.h index 9cd61fa..03be130 100644 --- a/chrome/browser/chromeos/drive/drive_resource_metadata.h +++ b/chrome/browser/chromeos/drive/drive_resource_metadata.h @@ -11,7 +11,7 @@ #include <vector> #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time.h" diff --git a/chrome/browser/chromeos/drive/drive_sync_client_unittest.cc b/chrome/browser/chromeos/drive/drive_sync_client_unittest.cc index 8146089..4551e7b 100644 --- a/chrome/browser/chromeos/drive/drive_sync_client_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_sync_client_unittest.cc @@ -8,8 +8,8 @@ #include <vector> #include "base/bind.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/memory/scoped_ptr.h" #include "base/message_loop.h" diff --git a/chrome/browser/chromeos/drive/drive_webapps_registry.cc b/chrome/browser/chromeos/drive/drive_webapps_registry.cc index 0da55eb..0737eff 100644 --- a/chrome/browser/chromeos/drive/drive_webapps_registry.cc +++ b/chrome/browser/chromeos/drive/drive_webapps_registry.cc @@ -9,11 +9,11 @@ #include <utility> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "content/public/browser/browser_thread.h" #include "chrome/browser/google_apis/drive_api_parser.h" +#include "content/public/browser/browser_thread.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/drive_webapps_registry_unittest.cc b/chrome/browser/chromeos/drive/drive_webapps_registry_unittest.cc index 90f8604..ae6547b 100644 --- a/chrome/browser/chromeos/drive/drive_webapps_registry_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_webapps_registry_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/chromeos/drive/drive_webapps_registry.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/message_loop.h" #include "base/path_service.h" diff --git a/chrome/browser/chromeos/drive/file_change.h b/chrome/browser/chromeos/drive/file_change.h index b9880e9..0285bd9 100644 --- a/chrome/browser/chromeos/drive/file_change.h +++ b/chrome/browser/chromeos/drive/file_change.h @@ -7,7 +7,7 @@ #include <set> -#include "base/file_path.h" +#include "base/files/file_path.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_system/create_directory_operation.h b/chrome/browser/chromeos/drive/file_system/create_directory_operation.h index cad884e..880ee45 100644 --- a/chrome/browser/chromeos/drive/file_system/create_directory_operation.h +++ b/chrome/browser/chromeos/drive/file_system/create_directory_operation.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_CREATE_DIRECTORY_OPERATION_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/chromeos/drive/mock_directory_change_observer.h b/chrome/browser/chromeos/drive/mock_directory_change_observer.h index 65068c5..4385d87 100644 --- a/chrome/browser/chromeos/drive/mock_directory_change_observer.h +++ b/chrome/browser/chromeos/drive/mock_directory_change_observer.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DIRECTORY_CHANGE_OBSERVER_H_ #define CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DIRECTORY_CHANGE_OBSERVER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/chromeos/drive/drive_file_system_observer.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc b/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc index aa036a2..d31db49e 100644 --- a/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc +++ b/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/values.h" #include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_test_util.h" diff --git a/chrome/browser/chromeos/drive/stale_cache_files_remover_unittest.cc b/chrome/browser/chromeos/drive/stale_cache_files_remover_unittest.cc index c2ae1b7..e9c8bcee 100644 --- a/chrome/browser/chromeos/drive/stale_cache_files_remover_unittest.cc +++ b/chrome/browser/chromeos/drive/stale_cache_files_remover_unittest.cc @@ -6,8 +6,8 @@ #include <vector> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/stringprintf.h" diff --git a/chrome/browser/chromeos/extensions/default_app_order.cc b/chrome/browser/chromeos/extensions/default_app_order.cc index d9acdc5..3f6bce4 100644 --- a/chrome/browser/chromeos/extensions/default_app_order.cc +++ b/chrome/browser/chromeos/extensions/default_app_order.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" #include "base/time.h" diff --git a/chrome/browser/chromeos/extensions/default_app_order_unittest.cc b/chrome/browser/chromeos/extensions/default_app_order_unittest.cc index 73ada42..689b032 100644 --- a/chrome/browser/chromeos/extensions/default_app_order_unittest.cc +++ b/chrome/browser/chromeos/extensions/default_app_order_unittest.cc @@ -7,8 +7,8 @@ #include <string> #include <vector> -#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/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc b/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc index ce0c101..9bb26fa 100644 --- a/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc +++ b/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/bind.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/json/json_file_value_serializer.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/chromeos/extensions/file_browser_handler_api.cc b/chrome/browser/chromeos/extensions/file_browser_handler_api.cc index a46ecba..a95ae51 100644 --- a/chrome/browser/chromeos/extensions/file_browser_handler_api.cc +++ b/chrome/browser/chromeos/extensions/file_browser_handler_api.cc @@ -31,8 +31,8 @@ #include "chrome/browser/chromeos/extensions/file_browser_handler_api.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" diff --git a/chrome/browser/chromeos/extensions/file_browser_handler_api.h b/chrome/browser/chromeos/extensions/file_browser_handler_api.h index 565cf32..851ef8f 100644 --- a/chrome/browser/chromeos/extensions/file_browser_handler_api.h +++ b/chrome/browser/chromeos/extensions/file_browser_handler_api.h @@ -15,7 +15,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/extensions/extension_function.h" class Browser; diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc index 460f4da..dcff9c8 100644 --- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc +++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc @@ -12,8 +12,8 @@ #include "base/base64.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/i18n/case_conversion.h" #include "base/json/json_writer.h" #include "base/logging.h" @@ -74,6 +74,7 @@ #include "net/base/network_change_notifier.h" #include "ui/base/l10n/l10n_util.h" #include "ui/shell_dialogs/selected_file_info.h" +#include "ui/webui/web_ui_util.h" #include "webkit/chromeos/fileapi/cros_mount_point_provider.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_file_util.h" @@ -81,7 +82,6 @@ #include "webkit/fileapi/file_system_types.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/file_system_util.h" -#include "ui/webui/web_ui_util.h" using extensions::app_file_handler_util::FindFileHandlersForMimeTypes; using chromeos::disks::DiskMountManager; diff --git a/chrome/browser/chromeos/extensions/file_manager_browsertest.cc b/chrome/browser/chromeos/extensions/file_manager_browsertest.cc index 41aa6f0..5dd7024 100644 --- a/chrome/browser/chromeos/extensions/file_manager_browsertest.cc +++ b/chrome/browser/chromeos/extensions/file_manager_browsertest.cc @@ -12,8 +12,8 @@ #include <string> #include "base/callback.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/file_path_watcher.h" #include "base/platform_file.h" #include "base/threading/platform_thread.h" diff --git a/chrome/browser/chromeos/extensions/file_manager_util.h b/chrome/browser/chromeos/extensions/file_manager_util.h index 00743b8..52cfe30 100644 --- a/chrome/browser/chromeos/extensions/file_manager_util.h +++ b/chrome/browser/chromeos/extensions/file_manager_util.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/google_apis/operation_registry.h" #include "googleurl/src/gurl.h" #include "ui/shell_dialogs/select_file_dialog.h" diff --git a/chrome/browser/chromeos/extensions/install_limiter.h b/chrome/browser/chromeos/extensions/install_limiter.h index 9b59dd4..1a470e5 100644 --- a/chrome/browser/chromeos/extensions/install_limiter.h +++ b/chrome/browser/chromeos/extensions/install_limiter.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/timer.h" diff --git a/chrome/browser/chromeos/extensions/zip_file_creator.h b/chrome/browser/chromeos/extensions/zip_file_creator.h index d43e8d2..78b82d5 100644 --- a/chrome/browser/chromeos/extensions/zip_file_creator.h +++ b/chrome/browser/chromeos/extensions/zip_file_creator.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/platform_file.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/chromeos/external_metrics.h b/chrome/browser/chromeos/external_metrics.h index 42a1378..20e77ee 100644 --- a/chrome/browser/chromeos/external_metrics.h +++ b/chrome/browser/chromeos/external_metrics.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/hash_tables.h" #include "base/memory/ref_counted.h" diff --git a/chrome/browser/chromeos/imageburner/burn_controller.cc b/chrome/browser/chromeos/imageburner/burn_controller.cc index 4e6ec94..2b8b783 100644 --- a/chrome/browser/chromeos/imageburner/burn_controller.cc +++ b/chrome/browser/chromeos/imageburner/burn_controller.cc @@ -5,13 +5,13 @@ #include "chrome/browser/chromeos/imageburner/burn_controller.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/chromeos/imageburner/burn_manager.h" -#include "grit/generated_resources.h" #include "googleurl/src/gurl.h" +#include "grit/generated_resources.h" namespace chromeos { namespace imageburner { diff --git a/chrome/browser/chromeos/imageburner/burn_manager.h b/chrome/browser/chromeos/imageburner/burn_manager.h index de0d16e..8b49675 100644 --- a/chrome/browser/chromeos/imageburner/burn_manager.h +++ b/chrome/browser/chromeos/imageburner/burn_manager.h @@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/time.h" diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h index 949247e..c964017 100644 --- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h +++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h @@ -7,7 +7,7 @@ #include "ash/wm/user_activity_observer.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" namespace extensions { diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index 77976f5..47d2f31 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -11,8 +11,8 @@ #include "base/chromeos/chromeos_version.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/chromeos/login/mock_user_image_manager.h b/chrome/browser/chromeos/login/mock_user_image_manager.h index 658c53b..9ee0328 100644 --- a/chrome/browser/chromeos/login/mock_user_image_manager.h +++ b/chrome/browser/chromeos/login/mock_user_image_manager.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/chromeos/login/user_image.h" #include "chrome/browser/chromeos/login/user_image_manager.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/chromeos/login/mock_user_manager.h b/chrome/browser/chromeos/login/mock_user_manager.h index 5efb915..cde30d5 100644 --- a/chrome/browser/chromeos/login/mock_user_manager.h +++ b/chrome/browser/chromeos/login/mock_user_manager.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/login/mock_user_image_manager.h" #include "chrome/browser/chromeos/login/user.h" diff --git a/chrome/browser/chromeos/login/parallel_authenticator.cc b/chrome/browser/chromeos/login/parallel_authenticator.cc index f2ec45e..c0b1dcf 100644 --- a/chrome/browser/chromeos/login/parallel_authenticator.cc +++ b/chrome/browser/chromeos/login/parallel_authenticator.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc index 66cf692..8c69324 100644 --- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc +++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc @@ -6,8 +6,8 @@ #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/string_util.h" diff --git a/chrome/browser/chromeos/login/user_image_loader.cc b/chrome/browser/chromeos/login/user_image_loader.cc index 7ba6b1a..301d712 100644 --- a/chrome/browser/chromeos/login/user_image_loader.cc +++ b/chrome/browser/chromeos/login/user_image_loader.cc @@ -5,8 +5,8 @@ #include "chrome/browser/chromeos/login/user_image_loader.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/threading/worker_pool.h" diff --git a/chrome/browser/chromeos/login/user_image_manager_impl.cc b/chrome/browser/chromeos/login/user_image_manager_impl.cc index 096b4b3..8db43bd 100644 --- a/chrome/browser/chromeos/login/user_image_manager_impl.cc +++ b/chrome/browser/chromeos/login/user_image_manager_impl.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/debug/trace_event.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc index 48e2035..acb48b3 100644 --- a/chrome/browser/chromeos/login/user_manager_impl.cc +++ b/chrome/browser/chromeos/login/user_manager_impl.cc @@ -13,8 +13,8 @@ #include "base/chromeos/chromeos_version.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/chromeos/login/wallpaper_manager.cc b/chrome/browser/chromeos/login/wallpaper_manager.cc index cb6db6d..aa549bb 100644 --- a/chrome/browser/chromeos/login/wallpaper_manager.cc +++ b/chrome/browser/chromeos/login/wallpaper_manager.cc @@ -8,8 +8,8 @@ #include "ash/shell.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" diff --git a/chrome/browser/chromeos/login/wallpaper_manager.h b/chrome/browser/chromeos/login/wallpaper_manager.h index f9a1a34..c7b75c7 100644 --- a/chrome/browser/chromeos/login/wallpaper_manager.h +++ b/chrome/browser/chromeos/login/wallpaper_manager.h @@ -8,7 +8,7 @@ #include <string> #include "ash/desktop_background/desktop_background_controller.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h" #include "base/threading/sequenced_worker_pool.h" diff --git a/chrome/browser/chromeos/mobile/mobile_activator.h b/chrome/browser/chromeos/mobile/mobile_activator.h index 5848a55..49ea96c 100644 --- a/chrome/browser/chromeos/mobile/mobile_activator.h +++ b/chrome/browser/chromeos/mobile/mobile_activator.h @@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" diff --git a/chrome/browser/chromeos/mobile_config.cc b/chrome/browser/chromeos/mobile_config.cc index eec29c7..651068b 100644 --- a/chrome/browser/chromeos/mobile_config.cc +++ b/chrome/browser/chromeos/mobile_config.cc @@ -7,8 +7,8 @@ #include <algorithm> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/stl_util.h" diff --git a/chrome/browser/chromeos/settings/mock_owner_key_util.h b/chrome/browser/chromeos/settings/mock_owner_key_util.h index 6c63e17..b64cba0 100644 --- a/chrome/browser/chromeos/settings/mock_owner_key_util.h +++ b/chrome/browser/chromeos/settings/mock_owner_key_util.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/settings/owner_key_util.h" diff --git a/chrome/browser/chromeos/settings/owner_key_util.h b/chrome/browser/chromeos/settings/owner_key_util.h index b41dfdc..8e42a50 100644 --- a/chrome/browser/chromeos/settings/owner_key_util.h +++ b/chrome/browser/chromeos/settings/owner_key_util.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" diff --git a/chrome/browser/chromeos/settings/owner_key_util_unittest.cc b/chrome/browser/chromeos/settings/owner_key_util_unittest.cc index 9ac917c..b009c33 100644 --- a/chrome/browser/chromeos/settings/owner_key_util_unittest.cc +++ b/chrome/browser/chromeos/settings/owner_key_util_unittest.cc @@ -8,8 +8,8 @@ #include <vector> #include "base/basictypes.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/memory/ref_counted.h" #include "base/stl_util.h" diff --git a/chrome/browser/chromeos/settings/session_manager_operation.cc b/chrome/browser/chromeos/settings/session_manager_operation.cc index 5ec4273..ecc86b1 100644 --- a/chrome/browser/chromeos/settings/session_manager_operation.cc +++ b/chrome/browser/chromeos/settings/session_manager_operation.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/stl_util.h" #include "base/task_runner_util.h" diff --git a/chrome/browser/chromeos/system/drm_settings.cc b/chrome/browser/chromeos/system/drm_settings.cc index 7bb6fd7..b56e0a3 100644 --- a/chrome/browser/chromeos/system/drm_settings.cc +++ b/chrome/browser/chromeos/system/drm_settings.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/chromeos/chromeos_version.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/chromeos/system/input_device_settings.cc b/chrome/browser/chromeos/system/input_device_settings.cc index da16565..f5a74fd 100644 --- a/chrome/browser/chromeos/system/input_device_settings.cc +++ b/chrome/browser/chromeos/system/input_device_settings.cc @@ -11,8 +11,8 @@ #include "base/bind.h" #include "base/chromeos/chromeos_version.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/process_util.h" #include "base/stringprintf.h" diff --git a/chrome/browser/chromeos/system/name_value_pairs_parser.cc b/chrome/browser/chromeos/system/name_value_pairs_parser.cc index 84928c7..4ac92e9 100644 --- a/chrome/browser/chromeos/system/name_value_pairs_parser.cc +++ b/chrome/browser/chromeos/system/name_value_pairs_parser.cc @@ -5,8 +5,8 @@ #include "chrome/browser/chromeos/system/name_value_pairs_parser.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/process_util.h" #include "base/stl_util.h" diff --git a/chrome/browser/chromeos/system/statistics_provider.cc b/chrome/browser/chromeos/system/statistics_provider.cc index c8b6d74..a8cb110 100644 --- a/chrome/browser/chromeos/system/statistics_provider.cc +++ b/chrome/browser/chromeos/system/statistics_provider.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/chromeos/chromeos_version.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/singleton.h" #include "base/synchronization/waitable_event.h" diff --git a/chrome/browser/chromeos/system/syslogs_provider.cc b/chrome/browser/chromeos/system/syslogs_provider.cc index ac06731..95bfa92 100644 --- a/chrome/browser/chromeos/system/syslogs_provider.cc +++ b/chrome/browser/chromeos/system/syslogs_provider.cc @@ -10,8 +10,8 @@ #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" diff --git a/chrome/browser/chromeos/system/timezone_settings.cc b/chrome/browser/chromeos/system/timezone_settings.cc index 7cd8e95..01c4cb5 100644 --- a/chrome/browser/chromeos/system/timezone_settings.cc +++ b/chrome/browser/chromeos/system/timezone_settings.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/chromeos/chromeos_version.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" diff --git a/chrome/browser/chromeos/system_logs/command_line_log_source.cc b/chrome/browser/chromeos/system_logs/command_line_log_source.cc index 55e5548..dec7206 100644 --- a/chrome/browser/chromeos/system_logs/command_line_log_source.cc +++ b/chrome/browser/chromeos/system_logs/command_line_log_source.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/process_util.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/chromeos/system_logs/lsb_release_log_source.cc b/chrome/browser/chromeos/system_logs/lsb_release_log_source.cc index 56c3496..e8fb238 100644 --- a/chrome/browser/chromeos/system_logs/lsb_release_log_source.cc +++ b/chrome/browser/chromeos/system_logs/lsb_release_log_source.cc @@ -8,11 +8,11 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" -#include "base/string_util.h" #include "base/string_split.h" +#include "base/string_util.h" #include "content/public/browser/browser_thread.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/version_loader.cc b/chrome/browser/chromeos/version_loader.cc index 6334b16..56bee93 100644 --- a/chrome/browser/chromeos/version_loader.cc +++ b/chrome/browser/chromeos/version_loader.cc @@ -7,8 +7,8 @@ #include <vector> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/message_loop.h" #include "base/string_split.h" diff --git a/chrome/browser/component_updater/component_unpacker.h b/chrome/browser/component_updater/component_unpacker.h index be26517..e51555c 100644 --- a/chrome/browser/component_updater/component_unpacker.h +++ b/chrome/browser/component_updater/component_unpacker.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" class ComponentInstaller; diff --git a/chrome/browser/component_updater/component_updater_service.cc b/chrome/browser/component_updater/component_updater_service.cc index f2d0155..44ae640 100644 --- a/chrome/browser/component_updater/component_updater_service.cc +++ b/chrome/browser/component_updater/component_updater_service.cc @@ -10,8 +10,8 @@ #include "base/at_exit.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc index 7232e45..e2c56f8 100644 --- a/chrome/browser/component_updater/pepper_flash_component_installer.cc +++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc @@ -12,8 +12,8 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/string_split.h" @@ -25,11 +25,11 @@ #include "build/build_config.h" #include "chrome/browser/component_updater/component_updater_service.h" #include "chrome/browser/plugins/plugin_prefs.h" -#include "chrome/common/pepper_flash.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pepper_flash.h" +#include "chrome/common/pepper_flash.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/plugin_service.h" #include "content/public/common/pepper_plugin_info.h" diff --git a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc index c4448e4..aa78dfd 100644 --- a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc +++ b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/logging.h" #include "base/path_service.h" diff --git a/chrome/browser/component_updater/recovery_component_installer.cc b/chrome/browser/component_updater/recovery_component_installer.cc index 8746743..9e779a1 100644 --- a/chrome/browser/component_updater/recovery_component_installer.cc +++ b/chrome/browser/component_updater/recovery_component_installer.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/prefs/pref_registry_simple.h" diff --git a/chrome/browser/component_updater/swiftshader_component_installer.cc b/chrome/browser/component_updater/swiftshader_component_installer.cc index 1a155ec0..f98d651 100644 --- a/chrome/browser/component_updater/swiftshader_component_installer.cc +++ b/chrome/browser/component_updater/swiftshader_component_installer.cc @@ -4,12 +4,12 @@ #include "chrome/browser/component_updater/swiftshader_component_installer.h" -#include "base/bind.h" #include "base/base_paths.h" +#include "base/bind.h" #include "base/compiler_specific.h" #include "base/cpu.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/string_util.h" diff --git a/chrome/browser/component_updater/test/component_installers_unittest.cc b/chrome/browser/component_updater/test/component_installers_unittest.cc index f0a38dc..54dcbbf 100644 --- a/chrome/browser/component_updater/test/component_installers_unittest.cc +++ b/chrome/browser/component_updater/test/component_installers_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/component_updater/flash_component_installer.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" diff --git a/chrome/browser/component_updater/test/component_updater_service_unittest.cc b/chrome/browser/component_updater/test/component_updater_service_unittest.cc index 5e27c7e..471c90a 100644 --- a/chrome/browser/component_updater/test/component_updater_service_unittest.cc +++ b/chrome/browser/component_updater/test/component_updater_service_unittest.cc @@ -8,8 +8,8 @@ #include <utility> #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_vector.h" #include "base/message_loop.h" #include "base/path_service.h" diff --git a/chrome/browser/crash_handler_host_linux.cc b/chrome/browser/crash_handler_host_linux.cc index d1a47b7..9298ebb 100644 --- a/chrome/browser/crash_handler_host_linux.cc +++ b/chrome/browser/crash_handler_host_linux.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/format_macros.h" #include "base/linux_util.h" #include "base/logging.h" diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc index 775af6d..373ee85 100644 --- a/chrome/browser/crash_recovery_browsertest.cc +++ b/chrome/browser/crash_recovery_browsertest.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/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/crash_upload_list.cc b/chrome/browser/crash_upload_list.cc index 9e30367..261b01c 100644 --- a/chrome/browser/crash_upload_list.cc +++ b/chrome/browser/crash_upload_list.cc @@ -8,8 +8,8 @@ #include <iterator> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string_split.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/diagnostics/diagnostics_model.cc b/chrome/browser/diagnostics/diagnostics_model.cc index e2bdc7b..2665011 100644 --- a/chrome/browser/diagnostics/diagnostics_model.cc +++ b/chrome/browser/diagnostics/diagnostics_model.cc @@ -9,11 +9,11 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" +#include "base/path_service.h" #include "base/stl_util.h" #include "base/string_util.h" -#include "base/path_service.h" #include "chrome/browser/diagnostics/diagnostics_test.h" #include "chrome/browser/diagnostics/recon_diagnostics.h" #include "chrome/browser/diagnostics/sqlite_diagnostics.h" diff --git a/chrome/browser/diagnostics/diagnostics_test.cc b/chrome/browser/diagnostics/diagnostics_test.cc index 2e46766..64d4797 100644 --- a/chrome/browser/diagnostics/diagnostics_test.cc +++ b/chrome/browser/diagnostics/diagnostics_test.cc @@ -4,7 +4,7 @@ #include "chrome/browser/diagnostics/diagnostics_test.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc index 731c68e..6ad0579 100644 --- a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc +++ b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc @@ -2,8 +2,8 @@ // 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/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/observer_list.h" diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 7638ec2..ac33a87 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/bind_helpers.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/memory/ref_counted.h" #include "base/path_service.h" diff --git a/chrome/browser/download/download_danger_prompt_browsertest.cc b/chrome/browser/download/download_danger_prompt_browsertest.cc index b3b5ca1..5dc13d7 100644 --- a/chrome/browser/download/download_danger_prompt_browsertest.cc +++ b/chrome/browser/download/download_danger_prompt_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/download/download_danger_prompt.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/download/download_extensions.h b/chrome/browser/download/download_extensions.h index e2ea0df..c027822 100644 --- a/chrome/browser/download/download_extensions.h +++ b/chrome/browser/download/download_extensions.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" namespace download_util { diff --git a/chrome/browser/download/download_file_icon_extractor.h b/chrome/browser/download/download_file_icon_extractor.h index 8425770..f7aa7cf 100644 --- a/chrome/browser/download/download_file_icon_extractor.h +++ b/chrome/browser/download/download_file_icon_extractor.h @@ -8,7 +8,7 @@ #include <string> #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/icon_loader.h" // Helper class for DownloadsGetFileIconFunction. Only used for a single icon diff --git a/chrome/browser/download/download_path_reservation_tracker_unittest.cc b/chrome/browser/download/download_path_reservation_tracker_unittest.cc index 452870b..6022931 100644 --- a/chrome/browser/download/download_path_reservation_tracker_unittest.cc +++ b/chrome/browser/download/download_path_reservation_tracker_unittest.cc @@ -2,8 +2,8 @@ // 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/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" diff --git a/chrome/browser/download/download_prefs.h b/chrome/browser/download/download_prefs.h index 83f1ad4c..a55e19a 100644 --- a/chrome/browser/download/download_prefs.h +++ b/chrome/browser/download/download_prefs.h @@ -7,7 +7,7 @@ #include <set> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/prefs/public/pref_member.h" class PrefRegistrySyncable; diff --git a/chrome/browser/download/download_query.cc b/chrome/browser/download/download_query.cc index b6bcc91..fd380fc 100644 --- a/chrome/browser/download/download_query.cc +++ b/chrome/browser/download/download_query.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/case_conversion.h" #include "base/i18n/string_search.h" #include "base/logging.h" diff --git a/chrome/browser/download/download_query_unittest.cc b/chrome/browser/download/download_query_unittest.cc index e45b5a9..3a178ae 100644 --- a/chrome/browser/download/download_query_unittest.cc +++ b/chrome/browser/download/download_query_unittest.cc @@ -5,7 +5,7 @@ #include <string> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" diff --git a/chrome/browser/download/download_status_updater_win.cc b/chrome/browser/download/download_status_updater_win.cc index fc96f4a..df74cea 100644 --- a/chrome/browser/download/download_status_updater_win.cc +++ b/chrome/browser/download/download_status_updater_win.cc @@ -7,7 +7,7 @@ #include <shobjidl.h> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/download/download_util.h b/chrome/browser/download/download_util.h index e3b3cdc..941e112 100644 --- a/chrome/browser/download/download_util.h +++ b/chrome/browser/download/download_util.h @@ -10,7 +10,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/string16.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc index 8070b1d..f7e73fe 100644 --- a/chrome/browser/download/save_page_browsertest.cc +++ b/chrome/browser/download/save_page_browsertest.cc @@ -5,8 +5,8 @@ #include "base/bind.h" #include "base/bind_helpers.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/path_service.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/enumerate_modules_model_win.cc b/chrome/browser/enumerate_modules_model_win.cc index 396a772..b6818de 100644 --- a/chrome/browser/enumerate_modules_model_win.cc +++ b/chrome/browser/enumerate_modules_model_win.cc @@ -11,8 +11,8 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_version_info_win.h" +#include "base/files/file_path.h" #include "base/i18n/case_conversion.h" #include "base/metrics/histogram.h" #include "base/string_util.h" diff --git a/chrome/browser/extensions/activity_database.h b/chrome/browser/extensions/activity_database.h index ebc4595..fd6fd73 100644 --- a/chrome/browser/extensions/activity_database.h +++ b/chrome/browser/extensions/activity_database.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_ACTIVITY_DATABASE_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted_memory.h" #include "chrome/browser/extensions/api_actions.h" #include "chrome/browser/extensions/blocked_actions.h" diff --git a/chrome/browser/extensions/activity_database_unittest.cc b/chrome/browser/extensions/activity_database_unittest.cc index db0906a..6f1dc58 100644 --- a/chrome/browser/extensions/activity_database_unittest.cc +++ b/chrome/browser/extensions/activity_database_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "chrome/browser/extensions/activity_database.h" #include "chrome/browser/extensions/api_actions.h" diff --git a/chrome/browser/extensions/api/api_resource_manager_unittest.cc b/chrome/browser/extensions/api/api_resource_manager_unittest.cc index 7e75096..8c4bbfc 100644 --- a/chrome/browser/extensions/api/api_resource_manager_unittest.cc +++ b/chrome/browser/extensions/api/api_resource_manager_unittest.cc @@ -2,18 +2,18 @@ // 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/string_util.h" #include "chrome/browser/extensions/api/api_resource.h" #include "chrome/browser/extensions/api/api_resource_manager.h" #include "chrome/browser/extensions/extension_function_test_utils.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_test_util.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "content/public/browser/browser_thread.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "chrome/browser/profiles/profile.h" #include "googleurl/src/gurl.h" +#include "testing/gtest/include/gtest/gtest.h" namespace utils = extension_function_test_utils; diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index a9159ab..7b70c92 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc @@ -5,7 +5,7 @@ #include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/file_util_icu.h" #include "base/i18n/time_formatting.h" #include "base/json/json_writer.h" diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc index 1586b3b..586a22b 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc @@ -5,15 +5,15 @@ #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_vector.h" #include "base/message_loop.h" #include "base/values.h" #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.h" #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h" #include "content/public/browser/resource_request_info.h" -#include "net/url_request/url_request_test_util.h" #include "net/test/test_server.h" +#include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" using base::DictionaryValue; diff --git a/chrome/browser/extensions/api/developer_private/entry_picker.cc b/chrome/browser/extensions/api/developer_private/entry_picker.cc index ed72222..2cd6bdf 100644 --- a/chrome/browser/extensions/api/developer_private/entry_picker.cc +++ b/chrome/browser/extensions/api/developer_private/entry_picker.cc @@ -5,8 +5,8 @@ #include "chrome/browser/extensions/api/developer_private/entry_picker.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "chrome/browser/extensions/api/developer_private/developer_private_api.h" #include "chrome/browser/extensions/shell_window_registry.h" diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/browser/extensions/api/downloads/downloads_api.h index 6efb8df..08714eb 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.h +++ b/chrome/browser/extensions/api/downloads/downloads_api.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/singleton.h" #include "base/string16.h" #include "base/values.h" diff --git a/chrome/browser/extensions/api/file_system/file_system_api.cc b/chrome/browser/extensions/api/file_system/file_system_api.cc index f60283e..5435410 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api.cc +++ b/chrome/browser/extensions/api/file_system/file_system_api.cc @@ -5,8 +5,8 @@ #include "chrome/browser/extensions/api/file_system/file_system_api.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/string_util.h" @@ -18,21 +18,21 @@ #include "chrome/browser/ui/extensions/shell_window.h" #include "chrome/common/extensions/api/file_system.h" #include "chrome/common/extensions/permissions/api_permission.h" -#include "grit/generated_resources.h" -#include "net/base/mime_util.h" #include "content/public/browser/child_process_security_policy.h" -#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "grit/generated_resources.h" +#include "net/base/mime_util.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/shell_dialogs/select_file_dialog.h" #include "webkit/fileapi/file_system_types.h" #include "webkit/fileapi/file_system_util.h" #include "webkit/fileapi/isolated_context.h" -#include "ui/base/l10n/l10n_util.h" -#include "ui/shell_dialogs/select_file_dialog.h" #if defined(OS_MACOSX) -#include "base/mac/foundation_util.h" #include <CoreFoundation/CoreFoundation.h> +#include "base/mac/foundation_util.h" #endif using fileapi::IsolatedContext; diff --git a/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc b/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc index b008b9f..dafa230 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc +++ b/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc @@ -2,8 +2,8 @@ // 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/file_util.h" +#include "base/files/file_path.h" #include "base/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/api/file_system/file_system_api.h" diff --git a/chrome/browser/extensions/api/management/management_api_browsertest.cc b/chrome/browser/extensions/api/management/management_api_browsertest.cc index aa4da64..f4462ff 100644 --- a/chrome/browser/extensions/api/management/management_api_browsertest.cc +++ b/chrome/browser/extensions/api/management/management_api_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.h b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.h index 88a7a8f..8058002 100644 --- a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.h +++ b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.h @@ -13,7 +13,7 @@ #include <map> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/media_gallery/media_galleries_preferences.h" diff --git a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc index a08ada1..0c265bb 100644 --- a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc +++ b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc @@ -7,7 +7,7 @@ #include "chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/stl_util.h" #include "base/string_number_conversions.h" diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc index 23eb7f7..adb476a 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc @@ -4,7 +4,7 @@ // // MediaGalleriesPrivate eject API browser tests. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_apitest.h" diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc index 996adf6..5aa0d4f 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc index d116461..c72978e 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc @@ -4,8 +4,8 @@ // // MediaGalleriesPrivate gallery watch API browser tests. -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host.cc b/chrome/browser/extensions/api/messaging/native_message_process_host.cc index bc7f725..af1be73 100644 --- a/chrome/browser/extensions/api/messaging/native_message_process_host.cc +++ b/chrome/browser/extensions/api/messaging/native_message_process_host.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/platform_file.h" #include "base/process_util.h" diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc index aa0ae5b..1a0f4d1 100644 --- a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc +++ b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc @@ -4,8 +4,8 @@ #include "base/bind.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/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/extensions/api/messaging/native_messaging_apitest_posix.cc b/chrome/browser/extensions/api/messaging/native_messaging_apitest_posix.cc index 6450b78..3649b83 100644 --- a/chrome/browser/extensions/api/messaging/native_messaging_apitest_posix.cc +++ b/chrome/browser/extensions/api/messaging/native_messaging_apitest_posix.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/extensions/api/record/record_api.h b/chrome/browser/extensions/api/record/record_api.h index 6c8b62f..e5c6189 100644 --- a/chrome/browser/extensions/api/record/record_api.h +++ b/chrome/browser/extensions/api/record/record_api.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_API_RECORD_RECORD_API_H_ #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/time.h" #include "chrome/browser/extensions/extension_function.h" diff --git a/chrome/browser/extensions/api/record/record_api_test.cc b/chrome/browser/extensions/api/record/record_api_test.cc index 03b905a..2700cc2 100644 --- a/chrome/browser/extensions/api/record/record_api_test.cc +++ b/chrome/browser/extensions/api/record/record_api_test.cc @@ -6,8 +6,8 @@ #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/browser/extensions/api/serial/serial_connection.cc b/chrome/browser/extensions/api/serial/serial_connection.cc index b976762..b453ee2 100644 --- a/chrome/browser/extensions/api/serial/serial_connection.cc +++ b/chrome/browser/extensions/api/serial/serial_connection.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" namespace extensions { diff --git a/chrome/browser/extensions/api/serial/serial_port_enumerator_posix.cc b/chrome/browser/extensions/api/serial/serial_port_enumerator_posix.cc index ed27ebc..ce29ea5 100644 --- a/chrome/browser/extensions/api/serial/serial_port_enumerator_posix.cc +++ b/chrome/browser/extensions/api/serial/serial_port_enumerator_posix.cc @@ -4,8 +4,8 @@ #include "chrome/browser/extensions/api/serial/serial_port_enumerator.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/extensions/api/storage/managed_value_store_cache.h b/chrome/browser/extensions/api/storage/managed_value_store_cache.h index b21fd89..3973fd5 100644 --- a/chrome/browser/extensions/api/storage/managed_value_store_cache.h +++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/callback_forward.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc index 0e00f45..29783a9 100644 --- a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc +++ b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/api/storage/policy_value_store.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/extensions/api/storage/settings_backend.h b/chrome/browser/extensions/api/storage/settings_backend.h index 1a3965e..1706828 100644 --- a/chrome/browser/extensions/api/storage/settings_backend.h +++ b/chrome/browser/extensions/api/storage/settings_backend.h @@ -10,7 +10,7 @@ #include <string> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/extensions/api/storage/settings_frontend.cc b/chrome/browser/extensions/api/storage/settings_frontend.cc index cd12a46..91fab87 100644 --- a/chrome/browser/extensions/api/storage/settings_frontend.cc +++ b/chrome/browser/extensions/api/storage/settings_frontend.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "chrome/browser/extensions/api/storage/leveldb_settings_storage_factory.h" #include "chrome/browser/extensions/api/storage/settings_backend.h" diff --git a/chrome/browser/extensions/api/storage/settings_storage_factory.h b/chrome/browser/extensions/api/storage/settings_storage_factory.h index e0d955b..7fd28cf 100644 --- a/chrome/browser/extensions/api/storage/settings_storage_factory.h +++ b/chrome/browser/extensions/api/storage/settings_storage_factory.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" class ValueStore; diff --git a/chrome/browser/extensions/api/storage/settings_test_util.cc b/chrome/browser/extensions/api/storage/settings_test_util.cc index 3c2d5c7..f201a44 100644 --- a/chrome/browser/extensions/api/storage/settings_test_util.cc +++ b/chrome/browser/extensions/api/storage/settings_test_util.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/api/storage/settings_test_util.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/extensions/api/storage/settings_frontend.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc b/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc index cd41bf4..f6d5d1b 100644 --- a/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc +++ b/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/sequenced_task_runner.h" #include "chrome/browser/extensions/api/storage/settings_backend.h" #include "chrome/browser/extensions/api/storage/settings_frontend.h" diff --git a/chrome/browser/extensions/api/system_info_storage/storage_info_provider_linux.h b/chrome/browser/extensions/api/system_info_storage/storage_info_provider_linux.h index c82e38c..5c14848 100644 --- a/chrome/browser/extensions/api/system_info_storage/storage_info_provider_linux.h +++ b/chrome/browser/extensions/api/system_info_storage/storage_info_provider_linux.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INFO_STORAGE_STORAGE_INFO_PROVIDER_LINUX_H_ #define CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INFO_STORAGE_STORAGE_INFO_PROVIDER_LINUX_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/extensions/api/system_info_storage/storage_info_provider.h" #include "chrome/browser/storage_monitor/udev_util_linux.h" diff --git a/chrome/browser/extensions/api/web_request/upload_data_presenter.cc b/chrome/browser/extensions/api/web_request/upload_data_presenter.cc index b1a1d05..e10ded0 100644 --- a/chrome/browser/extensions/api/web_request/upload_data_presenter.cc +++ b/chrome/browser/extensions/api/web_request/upload_data_presenter.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/api/web_request/upload_data_presenter.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/extensions/api/web_request/form_data_parser.h" diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc index 5559a5b..12ff0e2 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc index 3d24fab..72ba236 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc @@ -4,8 +4,8 @@ #include <vector> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/api/webstore_private/webstore_private_api.h" diff --git a/chrome/browser/extensions/app_notification_manager.cc b/chrome/browser/extensions/app_notification_manager.cc index 986c40d..2432cde 100644 --- a/chrome/browser/extensions/app_notification_manager.cc +++ b/chrome/browser/extensions/app_notification_manager.cc @@ -6,7 +6,7 @@ #include "base/auto_reset.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/metrics/histogram.h" #include "base/perftimer.h" diff --git a/chrome/browser/extensions/app_notification_storage.cc b/chrome/browser/extensions/app_notification_storage.cc index e527d43..30d7977 100644 --- a/chrome/browser/extensions/app_notification_storage.cc +++ b/chrome/browser/extensions/app_notification_storage.cc @@ -4,8 +4,8 @@ #include "chrome/browser/extensions/app_notification_storage.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/location.h" diff --git a/chrome/browser/extensions/app_notification_storage_unittest.cc b/chrome/browser/extensions/app_notification_storage_unittest.cc index a0a0bdd..ae0ca6e 100644 --- a/chrome/browser/extensions/app_notification_storage_unittest.cc +++ b/chrome/browser/extensions/app_notification_storage_unittest.cc @@ -2,8 +2,8 @@ // 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/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h index 58b998f..7f4bb8c 100644 --- a/chrome/browser/extensions/component_loader.h +++ b/chrome/browser/extensions/component_loader.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/prefs/public/pref_change_registrar.h" #include "base/values.h" diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc index 8e06161..ad200b6 100644 --- a/chrome/browser/extensions/convert_user_script.cc +++ b/chrome/browser/extensions/convert_user_script.cc @@ -8,8 +8,8 @@ #include <vector> #include "base/base64.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/json/json_file_value_serializer.h" #include "base/path_service.h" diff --git a/chrome/browser/extensions/convert_user_script_unittest.cc b/chrome/browser/extensions/convert_user_script_unittest.cc index 3c5901e..e87cb1f 100644 --- a/chrome/browser/extensions/convert_user_script_unittest.cc +++ b/chrome/browser/extensions/convert_user_script_unittest.cc @@ -5,8 +5,8 @@ #include <string> #include <vector> -#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/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/browser/extensions/convert_web_app.cc b/chrome/browser/extensions/convert_web_app.cc index 820a09d..dc65e33 100644 --- a/chrome/browser/extensions/convert_web_app.cc +++ b/chrome/browser/extensions/convert_web_app.cc @@ -10,8 +10,8 @@ #include <vector> #include "base/base64.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/json/json_file_value_serializer.h" #include "base/logging.h" diff --git a/chrome/browser/extensions/convert_web_app_unittest.cc b/chrome/browser/extensions/convert_web_app_unittest.cc index 60db8dc..8b9e0c5 100644 --- a/chrome/browser/extensions/convert_web_app_unittest.cc +++ b/chrome/browser/extensions/convert_web_app_unittest.cc @@ -7,8 +7,8 @@ #include <string> #include <vector> -#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/path_service.h" #include "base/stringprintf.h" diff --git a/chrome/browser/extensions/crx_installer.h b/chrome/browser/extensions/crx_installer.h index a0152f1..90ad001 100644 --- a/chrome/browser/extensions/crx_installer.h +++ b/chrome/browser/extensions/crx_installer.h @@ -8,7 +8,7 @@ #include <string> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/version.h" diff --git a/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc b/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc index a4cfe60..c4b3deb 100644 --- a/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc +++ b/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.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/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc index 30cb051..2a87f37 100644 --- a/chrome/browser/extensions/extension_browsertest.cc +++ b/chrome/browser/extensions/extension_browsertest.cc @@ -7,8 +7,8 @@ #include <vector> #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/path_service.h" #include "base/stringprintf.h" diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h index 864ab0b..1923857 100644 --- a/chrome/browser/extensions/extension_browsertest.h +++ b/chrome/browser/extensions/extension_browsertest.h @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_system.h" diff --git a/chrome/browser/extensions/extension_creator_filter.cc b/chrome/browser/extensions/extension_creator_filter.cc index 31fe356..a904d31 100644 --- a/chrome/browser/extensions/extension_creator_filter.cc +++ b/chrome/browser/extensions/extension_creator_filter.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/extension_creator_filter.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #if defined(OS_WIN) #include <windows.h> diff --git a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc index 31ca7b3..2007a98 100644 --- a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc +++ b/chrome/browser/extensions/extension_disabled_ui_browsertest.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/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/extensions/extension_browsertest.h" diff --git a/chrome/browser/extensions/extension_function_test_utils.cc b/chrome/browser/extensions/extension_function_test_utils.cc index b2d9283..b642c1f 100644 --- a/chrome/browser/extensions/extension_function_test_utils.cc +++ b/chrome/browser/extensions/extension_function_test_utils.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/values.h" #include "chrome/browser/extensions/api/tabs/tabs_constants.h" diff --git a/chrome/browser/extensions/extension_nacl_browsertest.cc b/chrome/browser/extensions/extension_nacl_browsertest.cc index 1640c84f..ce13401 100644 --- a/chrome/browser/extensions/extension_nacl_browsertest.cc +++ b/chrome/browser/extensions/extension_nacl_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc index 8c8b626..006d1d9 100644 --- a/chrome/browser/extensions/extension_protocols.cc +++ b/chrome/browser/extensions/extension_protocols.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" diff --git a/chrome/browser/extensions/extension_resource_protocols.cc b/chrome/browser/extensions/extension_resource_protocols.cc index 0e613dd..03f2a67 100644 --- a/chrome/browser/extensions/extension_resource_protocols.cc +++ b/chrome/browser/extensions/extension_resource_protocols.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/extension_resource_protocols.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_file_util.h" diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index 810725c..f86c72b 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -12,7 +12,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/extensions/extension_service_unittest.h b/chrome/browser/extensions/extension_service_unittest.h index 20e9202..f5bd434 100644 --- a/chrome/browser/extensions/extension_service_unittest.h +++ b/chrome/browser/extensions/extension_service_unittest.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_UNITTEST_H_ #include "base/at_exit.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc index 50d01f5..83fb022 100644 --- a/chrome/browser/extensions/extension_startup_browsertest.cc +++ b/chrome/browser/extensions/extension_startup_browsertest.cc @@ -5,8 +5,8 @@ #include <vector> #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string_util.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/extensions/extension_sync_data_unittest.cc b/chrome/browser/extensions/extension_sync_data_unittest.cc index 80147a8..f7bad7e 100644 --- a/chrome/browser/extensions/extension_sync_data_unittest.cc +++ b/chrome/browser/extensions/extension_sync_data_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/extension_sync_data.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/version.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc index d1031f2..dd7e8be 100644 --- a/chrome/browser/extensions/extension_system.cc +++ b/chrome/browser/extensions/extension_system.cc @@ -7,7 +7,7 @@ #include "base/base_switches.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/prefs/pref_service.h" #include "base/strings/string_tokenizer.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/extensions/external_loader.h b/chrome/browser/extensions/external_loader.h index 20971f0..1215836 100644 --- a/chrome/browser/extensions/external_loader.h +++ b/chrome/browser/extensions/external_loader.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTERNAL_LOADER_H_ #define CHROME_BROWSER_EXTENSIONS_EXTERNAL_LOADER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc index 0f025a1..b0c89d2 100644 --- a/chrome/browser/extensions/external_pref_loader.cc +++ b/chrome/browser/extensions/external_pref_loader.cc @@ -5,8 +5,8 @@ #include "chrome/browser/extensions/external_pref_loader.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h" diff --git a/chrome/browser/extensions/external_provider_impl.cc b/chrome/browser/extensions/external_provider_impl.cc index d067778..0cd1971 100644 --- a/chrome/browser/extensions/external_provider_impl.cc +++ b/chrome/browser/extensions/external_provider_impl.cc @@ -5,7 +5,7 @@ #include "chrome/browser/extensions/external_provider_impl.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/linked_ptr.h" #include "base/metrics/field_trial.h" diff --git a/chrome/browser/extensions/external_registry_loader_win.cc b/chrome/browser/extensions/external_registry_loader_win.cc index 988135b..23ed0ab 100644 --- a/chrome/browser/extensions/external_registry_loader_win.cc +++ b/chrome/browser/extensions/external_registry_loader_win.cc @@ -5,8 +5,8 @@ #include "chrome/browser/extensions/external_registry_loader_win.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_handle.h" #include "base/metrics/histogram.h" #include "base/string_util.h" diff --git a/chrome/browser/extensions/file_reader_unittest.cc b/chrome/browser/extensions/file_reader_unittest.cc index 3b89e1f..71ef3c8 100644 --- a/chrome/browser/extensions/file_reader_unittest.cc +++ b/chrome/browser/extensions/file_reader_unittest.cc @@ -4,8 +4,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/path_service.h" #include "chrome/browser/extensions/file_reader.h" diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc index 22d4149..deb0f85 100644 --- a/chrome/browser/extensions/installed_loader.cc +++ b/chrome/browser/extensions/installed_loader.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/installed_loader.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/metrics/histogram.h" #include "base/stringprintf.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc index b412272..f35694e 100644 --- a/chrome/browser/extensions/lazy_background_page_apitest.cc +++ b/chrome/browser/extensions/lazy_background_page_apitest.cc @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_model.h" +#include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/extensions/browser_action_test_util.h" #include "chrome/browser/extensions/extension_apitest.h" diff --git a/chrome/browser/extensions/pack_extension_job.h b/chrome/browser/extensions/pack_extension_job.h index 348274d..50fc1eb 100644 --- a/chrome/browser/extensions/pack_extension_job.h +++ b/chrome/browser/extensions/pack_extension_job.h @@ -7,11 +7,11 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/string16.h" -#include "content/public/browser/browser_thread.h" #include "chrome/browser/extensions/extension_creator.h" +#include "content/public/browser/browser_thread.h" namespace extensions { diff --git a/chrome/browser/extensions/permissions_updater_unittest.cc b/chrome/browser/extensions/permissions_updater_unittest.cc index 4908146..14e3610 100644 --- a/chrome/browser/extensions/permissions_updater_unittest.cc +++ b/chrome/browser/extensions/permissions_updater_unittest.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/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" diff --git a/chrome/browser/extensions/platform_app_launcher.cc b/chrome/browser/extensions/platform_app_launcher.cc index 8527476..78548d8 100644 --- a/chrome/browser/extensions/platform_app_launcher.cc +++ b/chrome/browser/extensions/platform_app_launcher.cc @@ -5,8 +5,8 @@ #include "chrome/browser/extensions/platform_app_launcher.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/string_util.h" diff --git a/chrome/browser/extensions/requirements_checker_browsertest.cc b/chrome/browser/extensions/requirements_checker_browsertest.cc index 2f54dfa..192239d 100644 --- a/chrome/browser/extensions/requirements_checker_browsertest.cc +++ b/chrome/browser/extensions/requirements_checker_browsertest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/path_service.h" diff --git a/chrome/browser/extensions/sandboxed_unpacker.h b/chrome/browser/extensions/sandboxed_unpacker.h index 2a8f414..d4ef975 100644 --- a/chrome/browser/extensions/sandboxed_unpacker.h +++ b/chrome/browser/extensions/sandboxed_unpacker.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/time.h" diff --git a/chrome/browser/extensions/script_bubble_controller_unittest.cc b/chrome/browser/extensions/script_bubble_controller_unittest.cc index d2b0ef9..12bc49d 100644 --- a/chrome/browser/extensions/script_bubble_controller_unittest.cc +++ b/chrome/browser/extensions/script_bubble_controller_unittest.cc @@ -5,7 +5,7 @@ #include <string> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "chrome/browser/extensions/component_loader.h" diff --git a/chrome/browser/extensions/state_store.h b/chrome/browser/extensions/state_store.h index fa11422..e9b4f3c 100644 --- a/chrome/browser/extensions/state_store.h +++ b/chrome/browser/extensions/state_store.h @@ -8,7 +8,7 @@ #include <set> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/value_store/value_store_frontend.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/extensions/system_info_event_router.h b/chrome/browser/extensions/system_info_event_router.h index 4569f2a..9e8d53b 100644 --- a/chrome/browser/extensions/system_info_event_router.h +++ b/chrome/browser/extensions/system_info_event_router.h @@ -7,7 +7,7 @@ #include <set> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/singleton.h" #include "base/values.h" #include "chrome/browser/extensions/api/system_info_storage/storage_info_provider.h" diff --git a/chrome/browser/extensions/unpacked_installer.h b/chrome/browser/extensions/unpacked_installer.h index 61790d0..6f78492 100644 --- a/chrome/browser/extensions/unpacked_installer.h +++ b/chrome/browser/extensions/unpacked_installer.h @@ -8,7 +8,7 @@ #include <string> #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/browser/extensions/updater/extension_downloader.cc b/chrome/browser/extensions/updater/extension_downloader.cc index ded33d4..71389d3 100644 --- a/chrome/browser/extensions/updater/extension_downloader.cc +++ b/chrome/browser/extensions/updater/extension_downloader.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/scoped_handle.h" diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/browser/extensions/updater/extension_updater.h index b51d9a7..ffb40e9 100644 --- a/chrome/browser/extensions/updater/extension_updater.h +++ b/chrome/browser/extensions/updater/extension_updater.h @@ -13,7 +13,7 @@ #include "base/callback_forward.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc index 3e51c11..9c270da 100644 --- a/chrome/browser/extensions/user_script_master.cc +++ b/chrome/browser/extensions/user_script_master.cc @@ -9,8 +9,8 @@ #include <vector> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/pickle.h" #include "base/stl_util.h" #include "base/string_util.h" diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h index 050995f..da050f8 100644 --- a/chrome/browser/extensions/user_script_master.h +++ b/chrome/browser/extensions/user_script_master.h @@ -9,7 +9,7 @@ #include <string> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/shared_memory.h" diff --git a/chrome/browser/extensions/user_script_master_unittest.cc b/chrome/browser/extensions/user_script_master_unittest.cc index 9f10a42..d71dd2a 100644 --- a/chrome/browser/extensions/user_script_master_unittest.cc +++ b/chrome/browser/extensions/user_script_master_unittest.cc @@ -6,8 +6,8 @@ #include <string> -#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/browser/fast_shutdown_browsertest.cc b/chrome/browser/fast_shutdown_browsertest.cc index 0829617..5b7c3fb 100644 --- a/chrome/browser/fast_shutdown_browsertest.cc +++ b/chrome/browser/fast_shutdown_browsertest.cc @@ -4,7 +4,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/feedback/feedback_util.h b/chrome/browser/feedback/feedback_util.h index f7e4670..cf32ac5 100644 --- a/chrome/browser/feedback/feedback_util.h +++ b/chrome/browser/feedback/feedback_util.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/feedback/feedback_data.h" #include "chrome/browser/feedback/proto/common.pb.h" #include "chrome/browser/feedback/proto/dom.pb.h" diff --git a/chrome/browser/first_run/first_run_linux.cc b/chrome/browser/first_run/first_run_linux.cc index c1a2c9d..6885c57 100644 --- a/chrome/browser/first_run/first_run_linux.cc +++ b/chrome/browser/first_run/first_run_linux.cc @@ -5,8 +5,8 @@ #include "chrome/browser/first_run/first_run.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/process_util.h" #include "base/string_piece.h" diff --git a/chrome/browser/first_run/first_run_mac.mm b/chrome/browser/first_run/first_run_mac.mm index c4d2730..cd6ecc6 100644 --- a/chrome/browser/first_run/first_run_mac.mm +++ b/chrome/browser/first_run/first_run_mac.mm @@ -4,11 +4,11 @@ #include "chrome/browser/first_run/first_run.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "chrome/browser/first_run/first_run_internal.h" -#include "chrome/browser/importer/importer_host.h" #include "chrome/browser/importer/external_process_importer_host.h" +#include "chrome/browser/importer/importer_host.h" #include "chrome/browser/mac/master_prefs.h" #include "chrome/browser/process_singleton.h" diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index 429b0b9..766ac29 100644 --- a/chrome/browser/first_run/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -10,8 +10,8 @@ #include "base/callback.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" #include "base/process_util.h" diff --git a/chrome/browser/first_run/upgrade_util_linux.cc b/chrome/browser/first_run/upgrade_util_linux.cc index 1a976a4..22b252c 100644 --- a/chrome/browser/first_run/upgrade_util_linux.cc +++ b/chrome/browser/first_run/upgrade_util_linux.cc @@ -6,8 +6,8 @@ #include "base/base_paths.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/platform_file.h" diff --git a/chrome/browser/first_run/upgrade_util_win.cc b/chrome/browser/first_run/upgrade_util_win.cc index a9e9f19..59754ad 100644 --- a/chrome/browser/first_run/upgrade_util_win.cc +++ b/chrome/browser/first_run/upgrade_util_win.cc @@ -13,8 +13,8 @@ #include "base/base_paths.h" #include "base/command_line.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/process_util.h" diff --git a/chrome/browser/google/google_update_win.cc b/chrome/browser/google/google_update_win.cc index bdb122d..ee732bf 100644 --- a/chrome/browser/google/google_update_win.cc +++ b/chrome/browser/google/google_update_win.cc @@ -8,7 +8,7 @@ #include <atlcom.h> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/string_util.h" diff --git a/chrome/browser/google/google_util_chromeos.cc b/chrome/browser/google/google_util_chromeos.cc index 6e2e7b6..c85ca7a 100644 --- a/chrome/browser/google/google_util_chromeos.cc +++ b/chrome/browser/google/google_util_chromeos.cc @@ -4,8 +4,8 @@ #include "base/basictypes.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/prefs/pref_service.h" #include "base/string_util.h" diff --git a/chrome/browser/google_apis/drive_api_operations_unittest.cc b/chrome/browser/google_apis/drive_api_operations_unittest.cc index b42fb7f..08d542c 100644 --- a/chrome/browser/google_apis/drive_api_operations_unittest.cc +++ b/chrome/browser/google_apis/drive_api_operations_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop_proxy.h" #include "base/values.h" #include "chrome/browser/google_apis/drive_api_operations.h" diff --git a/chrome/browser/google_apis/drive_api_parser.cc b/chrome/browser/google_apis/drive_api_parser.cc index 97e175a..403c4a4 100644 --- a/chrome/browser/google_apis/drive_api_parser.cc +++ b/chrome/browser/google_apis/drive_api_parser.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_value_converter.h" #include "base/memory/scoped_ptr.h" #include "base/string_piece.h" diff --git a/chrome/browser/google_apis/drive_api_parser_unittest.cc b/chrome/browser/google_apis/drive_api_parser_unittest.cc index d0747ec..00df543b 100644 --- a/chrome/browser/google_apis/drive_api_parser_unittest.cc +++ b/chrome/browser/google_apis/drive_api_parser_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/google_apis/drive_api_parser.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" #include "base/string16.h" diff --git a/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc b/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc index 79eb676..a70ba57 100644 --- a/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc +++ b/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc @@ -6,8 +6,8 @@ #include <map> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop_proxy.h" #include "base/string_split.h" #include "base/stringprintf.h" diff --git a/chrome/browser/google_apis/gdata_wapi_parser.cc b/chrome/browser/google_apis/gdata_wapi_parser.cc index 1290947..fd034f7 100644 --- a/chrome/browser/google_apis/gdata_wapi_parser.cc +++ b/chrome/browser/google_apis/gdata_wapi_parser.cc @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_value_converter.h" #include "base/memory/scoped_ptr.h" #include "base/string_piece.h" diff --git a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc index 4824d5b..6f4441a 100644 --- a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc +++ b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc @@ -6,8 +6,8 @@ #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/logging.h" #include "base/path_service.h" diff --git a/chrome/browser/google_apis/mock_drive_service.cc b/chrome/browser/google_apis/mock_drive_service.cc index a49df27..4f4f345 100644 --- a/chrome/browser/google_apis/mock_drive_service.cc +++ b/chrome/browser/google_apis/mock_drive_service.cc @@ -5,8 +5,8 @@ #include "chrome/browser/google_apis/mock_drive_service.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/location.h" #include "base/message_loop_proxy.h" diff --git a/chrome/browser/google_apis/operation_registry.h b/chrome/browser/google_apis/operation_registry.h index 2d43658..4533c36 100644 --- a/chrome/browser/google_apis/operation_registry.h +++ b/chrome/browser/google_apis/operation_registry.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/id_map.h" #include "base/observer_list.h" #include "base/time.h" diff --git a/chrome/browser/history/android/android_cache_database.h b/chrome/browser/history/android/android_cache_database.h index 829efb3..17e81f6 100644 --- a/chrome/browser/history/android/android_cache_database.h +++ b/chrome/browser/history/android/android_cache_database.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_HISTORY_ANDROID_ANDROID_CACHE_DATABASE_H_ #define CHROME_BROWSER_HISTORY_ANDROID_ANDROID_CACHE_DATABASE_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/time.h" #include "chrome/browser/history/android/android_history_types.h" diff --git a/chrome/browser/history/android/android_cache_database_unittest.cc b/chrome/browser/history/android/android_cache_database_unittest.cc index 77382a8..d8fb0d5 100644 --- a/chrome/browser/history/android/android_cache_database_unittest.cc +++ b/chrome/browser/history/android/android_cache_database_unittest.cc @@ -2,8 +2,8 @@ // 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/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/android/android_cache_database.h" diff --git a/chrome/browser/history/android/android_provider_backend.h b/chrome/browser/history/android/android_provider_backend.h index bc1ab16..7cc8644 100644 --- a/chrome/browser/history/android/android_provider_backend.h +++ b/chrome/browser/history/android/android_provider_backend.h @@ -7,7 +7,7 @@ #include <set> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/hash_tables.h" #include "base/memory/ref_counted.h" diff --git a/chrome/browser/history/android/android_provider_backend_unittest.cc b/chrome/browser/history/android/android_provider_backend_unittest.cc index be9e0c9..b26e368 100644 --- a/chrome/browser/history/android/android_provider_backend_unittest.cc +++ b/chrome/browser/history/android/android_provider_backend_unittest.cc @@ -6,8 +6,8 @@ #include <vector> -#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/memory/ref_counted.h" #include "base/stringprintf.h" diff --git a/chrome/browser/history/android/android_urls_database_unittest.cc b/chrome/browser/history/android/android_urls_database_unittest.cc index 8a4e1a7..cf970e5 100644 --- a/chrome/browser/history/android/android_urls_database_unittest.cc +++ b/chrome/browser/history/android/android_urls_database_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/history/android/android_urls_database.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/path_service.h" #include "chrome/browser/history/history_database.h" diff --git a/chrome/browser/history/android/urls_sql_handler_unittest.cc b/chrome/browser/history/android/urls_sql_handler_unittest.cc index 7d79a6e..06bfa79 100644 --- a/chrome/browser/history/android/urls_sql_handler_unittest.cc +++ b/chrome/browser/history/android/urls_sql_handler_unittest.cc @@ -6,8 +6,8 @@ #include "chrome/browser/history/android/urls_sql_handler.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/stringprintf.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/history/android/visit_sql_handler_unittest.cc b/chrome/browser/history/android/visit_sql_handler_unittest.cc index c54827a..a299468 100644 --- a/chrome/browser/history/android/visit_sql_handler_unittest.cc +++ b/chrome/browser/history/android/visit_sql_handler_unittest.cc @@ -6,8 +6,8 @@ #include "chrome/browser/history/android/visit_sql_handler.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/stringprintf.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/history/download_database.cc b/chrome/browser/history/download_database.cc index 0a0ba8f..0b91d4d 100644 --- a/chrome/browser/history/download_database.cc +++ b/chrome/browser/history/download_database.cc @@ -9,7 +9,7 @@ #include <vector> #include "base/debug/alias.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "base/stl_util.h" diff --git a/chrome/browser/history/download_row.h b/chrome/browser/history/download_row.h index f1435cb1..2f8b63b 100644 --- a/chrome/browser/history/download_row.h +++ b/chrome/browser/history/download_row.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/time.h" #include "content/public/browser/download_danger_type.h" #include "content/public/browser/download_interrupt_reasons.h" diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc index 3a9c08d..93fc873 100644 --- a/chrome/browser/history/expire_history_backend_unittest.cc +++ b/chrome/browser/history/expire_history_backend_unittest.cc @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.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/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h index c92fcfe..04c5c82 100644 --- a/chrome/browser/history/history_backend.h +++ b/chrome/browser/history/history_backend.h @@ -11,7 +11,7 @@ #include <vector> #include "base/containers/mru_cache.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/history/archived_database.h" diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc index ba6c328..240b169 100644 --- a/chrome/browser/history/history_backend_unittest.cc +++ b/chrome/browser/history/history_backend_unittest.cc @@ -10,8 +10,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/browser/history/history_database_unittest.cc b/chrome/browser/history/history_database_unittest.cc index e5354ad..06cac35 100644 --- a/chrome/browser/history/history_database_unittest.cc +++ b/chrome/browser/history/history_database_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/history/history_database.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/path_service.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/history/history_querying_unittest.cc b/chrome/browser/history/history_querying_unittest.cc index d1cf16b..c1355dd 100644 --- a/chrome/browser/history/history_querying_unittest.cc +++ b/chrome/browser/history/history_querying_unittest.cc @@ -5,8 +5,8 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.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/path_service.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/history/history_service.h b/chrome/browser/history/history_service.h index fd0a669..f39bef0 100644 --- a/chrome/browser/history/history_service.h +++ b/chrome/browser/history/history_service.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc index 1cedb19..83e7b22 100644 --- a/chrome/browser/history/history_unittest.cc +++ b/chrome/browser/history/history_unittest.cc @@ -28,8 +28,8 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/compiler_specific.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/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/history/in_memory_database.cc b/chrome/browser/history/in_memory_database.cc index 27b8a34..02b335f 100644 --- a/chrome/browser/history/in_memory_database.cc +++ b/chrome/browser/history/in_memory_database.cc @@ -4,7 +4,7 @@ #include "chrome/browser/history/in_memory_database.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/time.h" diff --git a/chrome/browser/history/in_memory_url_index.h b/chrome/browser/history/in_memory_url_index.h index 557793c..4190c2e 100644 --- a/chrome/browser/history/in_memory_url_index.h +++ b/chrome/browser/history/in_memory_url_index.h @@ -12,7 +12,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/history/in_memory_url_index_unittest.cc b/chrome/browser/history/in_memory_url_index_unittest.cc index e03f42c..8cd4790 100644 --- a/chrome/browser/history/in_memory_url_index_unittest.cc +++ b/chrome/browser/history/in_memory_url_index_unittest.cc @@ -6,8 +6,8 @@ #include <fstream> #include "base/auto_reset.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/browser/history/shortcuts_backend.h b/chrome/browser/history/shortcuts_backend.h index 1609e71..2f7eccc 100644 --- a/chrome/browser/history/shortcuts_backend.h +++ b/chrome/browser/history/shortcuts_backend.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/history/shortcuts_database.h b/chrome/browser/history/shortcuts_database.h index 594150a..538ea65 100644 --- a/chrome/browser/history/shortcuts_database.h +++ b/chrome/browser/history/shortcuts_database.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/string16.h" diff --git a/chrome/browser/history/text_database.h b/chrome/browser/history/text_database.h index 99ccff0..cf43848 100644 --- a/chrome/browser/history/text_database.h +++ b/chrome/browser/history/text_database.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "chrome/browser/history/history_types.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/history/text_database_manager.h b/chrome/browser/history/text_database_manager.h index 8d4b296..66e8210 100644 --- a/chrome/browser/history/text_database_manager.h +++ b/chrome/browser/history/text_database_manager.h @@ -11,13 +11,13 @@ #include "base/basictypes.h" #include "base/containers/mru_cache.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/string16.h" #include "chrome/browser/history/history_types.h" -#include "chrome/browser/history/text_database.h" #include "chrome/browser/history/query_parser.h" +#include "chrome/browser/history/text_database.h" #include "chrome/browser/history/url_database.h" namespace history { diff --git a/chrome/browser/history/text_database_manager_unittest.cc b/chrome/browser/history/text_database_manager_unittest.cc index 23402b9..8185773 100644 --- a/chrome/browser/history/text_database_manager_unittest.cc +++ b/chrome/browser/history/text_database_manager_unittest.cc @@ -4,8 +4,8 @@ #include <set> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/text_database_manager.h" diff --git a/chrome/browser/history/thumbnail_database_unittest.cc b/chrome/browser/history/thumbnail_database_unittest.cc index f041def..fc92feb 100644 --- a/chrome/browser/history/thumbnail_database_unittest.cc +++ b/chrome/browser/history/thumbnail_database_unittest.cc @@ -7,8 +7,8 @@ #include "base/basictypes.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/memory/ref_counted_memory.h" #include "base/path_service.h" diff --git a/chrome/browser/history/top_sites_backend.cc b/chrome/browser/history/top_sites_backend.cc index 93cf6e2..7a4e6e539 100644 --- a/chrome/browser/history/top_sites_backend.cc +++ b/chrome/browser/history/top_sites_backend.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "chrome/browser/history/top_sites_database.h" #include "chrome/common/cancelable_task_tracker.h" diff --git a/chrome/browser/history/top_sites_backend.h b/chrome/browser/history/top_sites_backend.h index 5028286..e77705f 100644 --- a/chrome/browser/history/top_sites_backend.h +++ b/chrome/browser/history/top_sites_backend.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_HISTORY_TOP_SITES_BACKEND_H_ #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/history/history_types.h" diff --git a/chrome/browser/history/top_sites_database_unittest.cc b/chrome/browser/history/top_sites_database_unittest.cc index ebd956b..8c509d3 100644 --- a/chrome/browser/history/top_sites_database_unittest.cc +++ b/chrome/browser/history/top_sites_database_unittest.cc @@ -2,8 +2,8 @@ // 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/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "chrome/browser/history/top_sites_database.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/history/url_database_unittest.cc b/chrome/browser/history/url_database_unittest.cc index 6b4cb28..d7c67cf 100644 --- a/chrome/browser/history/url_database_unittest.cc +++ b/chrome/browser/history/url_database_unittest.cc @@ -2,8 +2,8 @@ // 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/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/string_util.h" diff --git a/chrome/browser/history/url_index_private_data.h b/chrome/browser/history/url_index_private_data.h index d2d3ebb..cbb8692 100644 --- a/chrome/browser/history/url_index_private_data.h +++ b/chrome/browser/history/url_index_private_data.h @@ -8,11 +8,11 @@ #include <set> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" -#include "chrome/browser/history/in_memory_url_index_types.h" #include "chrome/browser/history/in_memory_url_index_cache.pb.h" +#include "chrome/browser/history/in_memory_url_index_types.h" #include "chrome/browser/history/scored_history_match.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/history/visit_database_unittest.cc b/chrome/browser/history/visit_database_unittest.cc index a76bef5..bdc33fc 100644 --- a/chrome/browser/history/visit_database_unittest.cc +++ b/chrome/browser/history/visit_database_unittest.cc @@ -5,8 +5,8 @@ #include <set> #include <vector> -#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/path_service.h" #include "base/string_util.h" diff --git a/chrome/browser/icon_manager_chromeos.cc b/chrome/browser/icon_manager_chromeos.cc index 60d173b..6a918fa 100644 --- a/chrome/browser/icon_manager_chromeos.cc +++ b/chrome/browser/icon_manager_chromeos.cc @@ -4,7 +4,7 @@ #include "chrome/browser/icon_manager.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" IconGroupID IconManager::GetGroupIDFromFilepath( diff --git a/chrome/browser/icon_manager_mac.mm b/chrome/browser/icon_manager_mac.mm index 09361ba..08b9328 100644 --- a/chrome/browser/icon_manager_mac.mm +++ b/chrome/browser/icon_manager_mac.mm @@ -4,7 +4,7 @@ #include "chrome/browser/icon_manager.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/sys_string_conversions.h" IconGroupID IconManager::GetGroupIDFromFilepath( diff --git a/chrome/browser/icon_manager_win.cc b/chrome/browser/icon_manager_win.cc index 7bf192f..a16e02e 100644 --- a/chrome/browser/icon_manager_win.cc +++ b/chrome/browser/icon_manager_win.cc @@ -4,7 +4,7 @@ #include "chrome/browser/icon_manager.h" -#include "base/file_path.h" +#include "base/files/file_path.h" IconGroupID IconManager::GetGroupIDFromFilepath( const base::FilePath& filepath) { diff --git a/chrome/browser/iframe_browsertest.cc b/chrome/browser/iframe_browsertest.cc index 9e46ba4..629175a 100644 --- a/chrome/browser/iframe_browsertest.cc +++ b/chrome/browser/iframe_browsertest.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/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc index 8e88d23..9813a28 100644 --- a/chrome/browser/importer/firefox2_importer.cc +++ b/chrome/browser/importer/firefox2_importer.cc @@ -7,8 +7,8 @@ #include <string> #include <vector> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/i18n/icu_string_conversions.h" #include "base/message_loop.h" #include "base/path_service.h" diff --git a/chrome/browser/importer/firefox2_importer.h b/chrome/browser/importer/firefox2_importer.h index a8d880e..5beb626 100644 --- a/chrome/browser/importer/firefox2_importer.h +++ b/chrome/browser/importer/firefox2_importer.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/string16.h" #include "chrome/browser/importer/importer.h" diff --git a/chrome/browser/importer/firefox3_importer.h b/chrome/browser/importer/firefox3_importer.h index 877a0fa..2cfa869 100644 --- a/chrome/browser/importer/firefox3_importer.h +++ b/chrome/browser/importer/firefox3_importer.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/importer/importer.h" class GURL; diff --git a/chrome/browser/importer/firefox_importer_unittest.cc b/chrome/browser/importer/firefox_importer_unittest.cc index 6551b35..eabc47b 100644 --- a/chrome/browser/importer/firefox_importer_unittest.cc +++ b/chrome/browser/importer/firefox_importer_unittest.cc @@ -5,8 +5,8 @@ #include "testing/gtest/include/gtest/gtest.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/stl_util.h" #include "base/string16.h" diff --git a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc index 1a52bb1a..638f860 100644 --- a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc +++ b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc @@ -4,11 +4,11 @@ #include "chrome/browser/importer/firefox_importer_unittest_utils.h" -#include "base/bind.h" #include "base/base_switches.h" +#include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/test/test_timeouts.h" #include "chrome/browser/importer/firefox_importer_utils.h" diff --git a/chrome/browser/importer/firefox_profile_lock.cc b/chrome/browser/importer/firefox_profile_lock.cc index 1232890..dab0381 100644 --- a/chrome/browser/importer/firefox_profile_lock.cc +++ b/chrome/browser/importer/firefox_profile_lock.cc @@ -4,7 +4,7 @@ #include "chrome/browser/importer/firefox_profile_lock.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/threading/thread_restrictions.h" // This class is based on Firefox code in: diff --git a/chrome/browser/importer/firefox_profile_lock.h b/chrome/browser/importer/firefox_profile_lock.h index 98141675..ff0d53c 100644 --- a/chrome/browser/importer/firefox_profile_lock.h +++ b/chrome/browser/importer/firefox_profile_lock.h @@ -12,7 +12,7 @@ #endif #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" // Firefox is designed to allow only one application to access its diff --git a/chrome/browser/importer/firefox_proxy_settings.cc b/chrome/browser/importer/firefox_proxy_settings.cc index 427bca84..be2b2a8 100644 --- a/chrome/browser/importer/firefox_proxy_settings.cc +++ b/chrome/browser/importer/firefox_proxy_settings.cc @@ -4,7 +4,7 @@ #include "chrome/browser/importer/firefox_proxy_settings.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "base/strings/string_tokenizer.h" #include "base/values.h" diff --git a/chrome/browser/importer/firefox_proxy_settings_unittest.cc b/chrome/browser/importer/firefox_proxy_settings_unittest.cc index 3912793..7699e13 100644 --- a/chrome/browser/importer/firefox_proxy_settings_unittest.cc +++ b/chrome/browser/importer/firefox_proxy_settings_unittest.cc @@ -4,7 +4,7 @@ #include "testing/gtest/include/gtest/gtest.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "chrome/browser/importer/firefox_proxy_settings.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc index b1d606b..7a87ea9 100644 --- a/chrome/browser/importer/ie_importer.cc +++ b/chrome/browser/importer/ie_importer.cc @@ -15,8 +15,8 @@ #include <string> #include <vector> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "base/string_split.h" #include "base/string_util.h" diff --git a/chrome/browser/importer/ie_importer.h b/chrome/browser/importer/ie_importer.h index f072d5a..5330610 100644 --- a/chrome/browser/importer/ie_importer.h +++ b/chrome/browser/importer/ie_importer.h @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" -#include "base/file_path.h" #include "base/string16.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/importer/profile_writer.h" diff --git a/chrome/browser/importer/importer_data_types.h b/chrome/browser/importer/importer_data_types.h index 996d2be..90c8075 100644 --- a/chrome/browser/importer/importer_data_types.h +++ b/chrome/browser/importer/importer_data_types.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/string16.h" #include "chrome/browser/importer/importer_type.h" diff --git a/chrome/browser/importer/mork_reader.cc b/chrome/browser/importer/mork_reader.cc index 0181468..afcd585 100644 --- a/chrome/browser/importer/mork_reader.cc +++ b/chrome/browser/importer/mork_reader.cc @@ -44,7 +44,7 @@ #include <algorithm> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/icu_string_conversions.h" #include "base/logging.h" #include "base/message_loop.h" diff --git a/chrome/browser/importer/nss_decryptor_mac.mm b/chrome/browser/importer/nss_decryptor_mac.mm index ebcd271..caaa496 100644 --- a/chrome/browser/importer/nss_decryptor_mac.mm +++ b/chrome/browser/importer/nss_decryptor_mac.mm @@ -6,12 +6,12 @@ #include <dlfcn.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/sys_string_conversions.h" -#include "chrome/browser/importer/nss_decryptor_mac.h" #include "chrome/browser/importer/firefox_importer_utils.h" +#include "chrome/browser/importer/nss_decryptor_mac.h" // Important!! : On OS X the nss3 libraries are compiled with depedencies // on one another, referenced using dyld's @executable_path directive. diff --git a/chrome/browser/importer/nss_decryptor_system_nss.cc b/chrome/browser/importer/nss_decryptor_system_nss.cc index 10a4c62..388caa4 100644 --- a/chrome/browser/importer/nss_decryptor_system_nss.cc +++ b/chrome/browser/importer/nss_decryptor_system_nss.cc @@ -8,7 +8,7 @@ #include <pk11sdr.h> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/stringprintf.h" #include "base/sys_string_conversions.h" #include "crypto/nss_util.h" diff --git a/chrome/browser/importer/nss_decryptor_win.cc b/chrome/browser/importer/nss_decryptor_win.cc index a6fe5453e..bc6ef4b 100644 --- a/chrome/browser/importer/nss_decryptor_win.cc +++ b/chrome/browser/importer/nss_decryptor_win.cc @@ -4,7 +4,7 @@ #include "chrome/browser/importer/nss_decryptor_win.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/sys_string_conversions.h" namespace { diff --git a/chrome/browser/importer/safari_importer.h b/chrome/browser/importer/safari_importer.h index bf01630..6c2d80c 100644 --- a/chrome/browser/importer/safari_importer.h +++ b/chrome/browser/importer/safari_importer.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/importer/profile_writer.h" diff --git a/chrome/browser/importer/safari_importer_unittest.mm b/chrome/browser/importer/safari_importer_unittest.mm index ca9e700..0ae2401 100644 --- a/chrome/browser/importer/safari_importer_unittest.mm +++ b/chrome/browser/importer/safari_importer_unittest.mm @@ -5,8 +5,8 @@ #include "chrome/browser/importer/safari_importer.h" #include "base/basictypes.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/path_service.h" #include "base/string16.h" diff --git a/chrome/browser/mac/install_from_dmg.mm b/chrome/browser/mac/install_from_dmg.mm index e6cbe72..1d4718e 100644 --- a/chrome/browser/mac/install_from_dmg.mm +++ b/chrome/browser/mac/install_from_dmg.mm @@ -4,8 +4,8 @@ #include "chrome/browser/mac/install_from_dmg.h" -#include <ApplicationServices/ApplicationServices.h> #import <AppKit/AppKit.h> +#include <ApplicationServices/ApplicationServices.h> #include <CoreFoundation/CoreFoundation.h> #include <CoreServices/CoreServices.h> #include <DiskArbitration/DiskArbitration.h> @@ -19,7 +19,7 @@ #include "base/auto_reset.h" #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/mac/authorization_util.h" #include "base/mac/bundle_locations.h" diff --git a/chrome/browser/mac/master_prefs.h b/chrome/browser/mac/master_prefs.h index fc7ccd6..91a11f8 100644 --- a/chrome/browser/mac/master_prefs.h +++ b/chrome/browser/mac/master_prefs.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_MAC_MASTER_PREFS_H_ #define CHROME_BROWSER_MAC_MASTER_PREFS_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" namespace master_prefs { diff --git a/chrome/browser/managed_mode/managed_mode_site_list.h b/chrome/browser/managed_mode/managed_mode_site_list.h index 015b005..2b04189 100644 --- a/chrome/browser/managed_mode/managed_mode_site_list.h +++ b/chrome/browser/managed_mode/managed_mode_site_list.h @@ -8,7 +8,7 @@ #include <string> #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/scoped_vector.h" diff --git a/chrome/browser/managed_mode/managed_mode_url_filter.cc b/chrome/browser/managed_mode/managed_mode_url_filter.cc index b4d2b79..9ca943f 100644 --- a/chrome/browser/managed_mode/managed_mode_url_filter.cc +++ b/chrome/browser/managed_mode/managed_mode_url_filter.cc @@ -4,7 +4,7 @@ #include "chrome/browser/managed_mode/managed_mode_url_filter.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/hash_tables.h" #include "base/json/json_file_value_serializer.h" #include "base/metrics/histogram.h" diff --git a/chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.cc b/chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.cc index 7831699f..43f80cb 100644 --- a/chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.cc +++ b/chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.cc @@ -5,8 +5,8 @@ #include "chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/sequenced_task_runner.h" #include "base/string_util.h" #include "chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h" diff --git a/chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h b/chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h index 63c7de2..308d3ca 100644 --- a/chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h +++ b/chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/time.h" #include "device/media_transfer_protocol/mtp_file_entry.pb.h" #include "webkit/fileapi/file_system_file_util.h" diff --git a/chrome/browser/media_gallery/linux/mtp_read_file_worker.h b/chrome/browser/media_gallery/linux/mtp_read_file_worker.h index 0d31f9b..e373573 100644 --- a/chrome/browser/media_gallery/linux/mtp_read_file_worker.h +++ b/chrome/browser/media_gallery/linux/mtp_read_file_worker.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/sequenced_task_runner_helpers.h" #include "base/synchronization/cancellation_flag.h" diff --git a/chrome/browser/media_gallery/linux/mtp_recursive_device_object_enumerator.h b/chrome/browser/media_gallery/linux/mtp_recursive_device_object_enumerator.h index 0b7801f..46f8217 100644 --- a/chrome/browser/media_gallery/linux/mtp_recursive_device_object_enumerator.h +++ b/chrome/browser/media_gallery/linux/mtp_recursive_device_object_enumerator.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/time.h" #include "device/media_transfer_protocol/mtp_file_entry.pb.h" diff --git a/chrome/browser/media_gallery/mac/mtp_device_delegate_impl_mac.h b/chrome/browser/media_gallery/mac/mtp_device_delegate_impl_mac.h index c782255..54b61c9 100644 --- a/chrome/browser/media_gallery/mac/mtp_device_delegate_impl_mac.h +++ b/chrome/browser/media_gallery/mac/mtp_device_delegate_impl_mac.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/hash_tables.h" #include "base/memory/weak_ptr.h" #include "base/platform_file.h" diff --git a/chrome/browser/media_gallery/media_file_system_registry.cc b/chrome/browser/media_gallery/media_file_system_registry.cc index 5eb9206..dc8d8b3 100644 --- a/chrome/browser/media_gallery/media_file_system_registry.cc +++ b/chrome/browser/media_gallery/media_file_system_registry.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_writer.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/media_gallery/media_file_system_registry.h b/chrome/browser/media_gallery/media_file_system_registry.h index 5b28221..61d39dd 100644 --- a/chrome/browser/media_gallery/media_file_system_registry.h +++ b/chrome/browser/media_gallery/media_file_system_registry.h @@ -14,7 +14,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/media_gallery/media_galleries_preferences.h" diff --git a/chrome/browser/media_gallery/media_galleries_preferences.h b/chrome/browser/media_gallery/media_galleries_preferences.h index 9c070ff..18a8eaa 100644 --- a/chrome/browser/media_gallery/media_galleries_preferences.h +++ b/chrome/browser/media_gallery/media_galleries_preferences.h @@ -10,7 +10,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/observer_list.h" #include "base/string16.h" #include "base/time.h" diff --git a/chrome/browser/media_gallery/media_galleries_test_util.cc b/chrome/browser/media_gallery/media_galleries_test_util.cc index 5cf3b48..26cf344 100644 --- a/chrome/browser/media_gallery/media_galleries_test_util.cc +++ b/chrome/browser/media_gallery/media_galleries_test_util.cc @@ -4,8 +4,8 @@ #include "chrome/browser/media_gallery/media_galleries_test_util.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/stringprintf.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/media_gallery/mtp_device_delegate_impl.h b/chrome/browser/media_gallery/mtp_device_delegate_impl.h index 4b4d10e..6051771 100644 --- a/chrome/browser/media_gallery/mtp_device_delegate_impl.h +++ b/chrome/browser/media_gallery/mtp_device_delegate_impl.h @@ -12,7 +12,7 @@ #endif #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "webkit/fileapi/media/mtp_device_async_delegate.h" #include "webkit/fileapi/media/mtp_device_delegate.h" diff --git a/chrome/browser/media_gallery/scoped_mtp_device_map_entry.h b/chrome/browser/media_gallery/scoped_mtp_device_map_entry.h index 62239a4..c5f7bcd 100644 --- a/chrome/browser/media_gallery/scoped_mtp_device_map_entry.h +++ b/chrome/browser/media_gallery/scoped_mtp_device_map_entry.h @@ -10,7 +10,7 @@ #define CHROME_BROWSER_MEDIA_GALLERY_SCOPED_MTP_DEVICE_MAP_ENTRY_H_ #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/sequenced_task_runner_helpers.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/media_gallery/win/mtp_device_delegate_impl_win.cc b/chrome/browser/media_gallery/win/mtp_device_delegate_impl_win.cc index 2178950..ac315ee 100644 --- a/chrome/browser/media_gallery/win/mtp_device_delegate_impl_win.cc +++ b/chrome/browser/media_gallery/win/mtp_device_delegate_impl_win.cc @@ -10,8 +10,8 @@ #include <vector> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/sequenced_task_runner.h" #include "base/sequenced_task_runner_helpers.h" diff --git a/chrome/browser/media_gallery/win/mtp_device_object_enumerator.h b/chrome/browser/media_gallery/win/mtp_device_object_enumerator.h index 079d423..58aa73c 100644 --- a/chrome/browser/media_gallery/win/mtp_device_object_enumerator.h +++ b/chrome/browser/media_gallery/win/mtp_device_object_enumerator.h @@ -8,7 +8,7 @@ #ifndef CHROME_BROWSER_MEDIA_GALLERY_WIN_MTP_DEVICE_OBJECT_ENUMERATOR_H_ #define CHROME_BROWSER_MEDIA_GALLERY_WIN_MTP_DEVICE_OBJECT_ENUMERATOR_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/threading/thread_checker.h" #include "base/time.h" #include "chrome/browser/media_gallery/win/mtp_device_object_entry.h" diff --git a/chrome/browser/media_gallery/win/mtp_device_operations_util.cc b/chrome/browser/media_gallery/win/mtp_device_operations_util.cc index e56a402..fdc095c 100644 --- a/chrome/browser/media_gallery/win/mtp_device_operations_util.cc +++ b/chrome/browser/media_gallery/win/mtp_device_operations_util.cc @@ -9,8 +9,8 @@ #include <algorithm> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/string_util.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/browser/media_gallery/win/recursive_mtp_device_object_enumerator.cc b/chrome/browser/media_gallery/win/recursive_mtp_device_object_enumerator.cc index 9cd29d5..c53d913 100644 --- a/chrome/browser/media_gallery/win/recursive_mtp_device_object_enumerator.cc +++ b/chrome/browser/media_gallery/win/recursive_mtp_device_object_enumerator.cc @@ -6,7 +6,7 @@ #include "chrome/browser/media_gallery/win/recursive_mtp_device_object_enumerator.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/media_gallery/win/mtp_device_object_entry.h" #include "chrome/browser/media_gallery/win/mtp_device_object_enumerator.h" diff --git a/chrome/browser/memory_details_mac.cc b/chrome/browser/memory_details_mac.cc index ad158d5b..cffa884 100644 --- a/chrome/browser/memory_details_mac.cc +++ b/chrome/browser/memory_details_mac.cc @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_version_info.h" +#include "base/files/file_path.h" #include "base/mac/mac_util.h" #include "base/process_util.h" #include "base/string_util.h" diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc index 63e7949..5069fe6 100644 --- a/chrome/browser/memory_details_win.cc +++ b/chrome/browser/memory_details_win.cc @@ -7,8 +7,8 @@ #include <psapi.h> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_version_info.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/win/scoped_handle.h" diff --git a/chrome/browser/metrics/metrics_service_browsertest.cc b/chrome/browser/metrics/metrics_service_browsertest.cc index 55093ca..29df04f 100644 --- a/chrome/browser/metrics/metrics_service_browsertest.cc +++ b/chrome/browser/metrics/metrics_service_browsertest.cc @@ -8,7 +8,7 @@ #include <string> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/metrics/variations/variations_registry_syncer_win.cc b/chrome/browser/metrics/variations/variations_registry_syncer_win.cc index 842a1a0..bb6bb8b 100644 --- a/chrome/browser/metrics/variations/variations_registry_syncer_win.cc +++ b/chrome/browser/metrics/variations/variations_registry_syncer_win.cc @@ -4,7 +4,7 @@ #include "chrome/browser/metrics/variations/variations_registry_syncer_win.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/metrics/field_trial.h" #include "base/path_service.h" #include "base/string_number_conversions.h" diff --git a/chrome/browser/mouseleave_browsertest.cc b/chrome/browser/mouseleave_browsertest.cc index e11e442..d1687e3 100644 --- a/chrome/browser/mouseleave_browsertest.cc +++ b/chrome/browser/mouseleave_browsertest.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/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" diff --git a/chrome/browser/nacl_host/nacl_process_host.h b/chrome/browser/nacl_host/nacl_process_host.h index c321171e..82d8799 100644 --- a/chrome/browser/nacl_host/nacl_process_host.h +++ b/chrome/browser/nacl_host/nacl_process_host.h @@ -7,7 +7,7 @@ #include "build/build_config.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/file_util_proxy.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/nacl_host/pnacl_file_host.cc b/chrome/browser/nacl_host/pnacl_file_host.cc index 966fc7f..ac630f9 100644 --- a/chrome/browser/nacl_host/pnacl_file_host.cc +++ b/chrome/browser/nacl_host/pnacl_file_host.cc @@ -5,8 +5,8 @@ #include "chrome/browser/nacl_host/pnacl_file_host.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/platform_file.h" diff --git a/chrome/browser/nacl_host/pnacl_file_host_unittest.cc b/chrome/browser/nacl_host/pnacl_file_host_unittest.cc index 7c60893..64bdd7b 100644 --- a/chrome/browser/nacl_host/pnacl_file_host_unittest.cc +++ b/chrome/browser/nacl_host/pnacl_file_host_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/nacl_host/pnacl_file_host.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/test/scoped_path_override.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc b/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc index 7494f69..c70578d 100644 --- a/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc +++ b/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc @@ -7,7 +7,7 @@ #include <string> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/synchronization/waitable_event.h" diff --git a/chrome/browser/net/net_log_temp_file.h b/chrome/browser/net/net_log_temp_file.h index b47899b..83d3d85 100644 --- a/chrome/browser/net/net_log_temp_file.h +++ b/chrome/browser/net/net_log_temp_file.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/net/net_log_temp_file_unittest.cc b/chrome/browser/net/net_log_temp_file_unittest.cc index 688206d..6337b03 100644 --- a/chrome/browser/net/net_log_temp_file_unittest.cc +++ b/chrome/browser/net/net_log_temp_file_unittest.cc @@ -5,8 +5,8 @@ #include "chrome/browser/net/net_log_temp_file.h" #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/values.h" #include "build/build_config.h" diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc b/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc index 171683e..2df77c64 100644 --- a/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc +++ b/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/testing_pref_service.h" diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.cc b/chrome/browser/net/sqlite_persistent_cookie_store.cc index 09b3792..0d14ecf 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store.cc +++ b/chrome/browser/net/sqlite_persistent_cookie_store.cc @@ -12,8 +12,8 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/net/sqlite_server_bound_cert_store.cc b/chrome/browser/net/sqlite_server_bound_cert_store.cc index 1bbe05d..f82812d 100644 --- a/chrome/browser/net/sqlite_server_bound_cert_store.cc +++ b/chrome/browser/net/sqlite_server_bound_cert_store.cc @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" diff --git a/chrome/browser/net/transport_security_persister.cc b/chrome/browser/net/transport_security_persister.cc index f6b84cc..5b9d73d 100644 --- a/chrome/browser/net/transport_security_persister.cc +++ b/chrome/browser/net/transport_security_persister.cc @@ -6,8 +6,8 @@ #include "base/base64.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/message_loop.h" diff --git a/chrome/browser/net/transport_security_persister.h b/chrome/browser/net/transport_security_persister.h index acd78bf..6c58dcc 100644 --- a/chrome/browser/net/transport_security_persister.h +++ b/chrome/browser/net/transport_security_persister.h @@ -35,7 +35,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/important_file_writer.h" #include "base/memory/weak_ptr.h" #include "net/base/transport_security_state.h" diff --git a/chrome/browser/net/transport_security_persister_unittest.cc b/chrome/browser/net/transport_security_persister_unittest.cc index bd6e95b..a63655b 100644 --- a/chrome/browser/net/transport_security_persister_unittest.cc +++ b/chrome/browser/net/transport_security_persister_unittest.cc @@ -8,8 +8,8 @@ #include <string> #include <vector> -#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 "content/public/test/test_browser_thread.h" diff --git a/chrome/browser/page_cycler/page_cycler.cc b/chrome/browser/page_cycler/page_cycler.cc index c6813a6d..13bdcd7 100644 --- a/chrome/browser/page_cycler/page_cycler.cc +++ b/chrome/browser/page_cycler/page_cycler.cc @@ -5,8 +5,8 @@ #include "chrome/browser/page_cycler/page_cycler.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/process_util.h" #include "base/string_split.h" diff --git a/chrome/browser/page_cycler/page_cycler.h b/chrome/browser/page_cycler/page_cycler.h index 6d19c3a..5212da9 100644 --- a/chrome/browser/page_cycler/page_cycler.h +++ b/chrome/browser/page_cycler/page_cycler.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PAGE_CYCLER_PAGE_CYCLER_H_ #define CHROME_BROWSER_PAGE_CYCLER_PAGE_CYCLER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "chrome/browser/ui/browser_list_observer.h" #include "content/public/browser/navigation_controller.h" diff --git a/chrome/browser/page_cycler/page_cycler_browsertest.cc b/chrome/browser/page_cycler/page_cycler_browsertest.cc index 3d4b2f3..26096ac 100644 --- a/chrome/browser/page_cycler/page_cycler_browsertest.cc +++ b/chrome/browser/page_cycler/page_cycler_browsertest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string_split.h" #include "base/string_util.h" diff --git a/chrome/browser/parsers/metadata_parser_filebase.h b/chrome/browser/parsers/metadata_parser_filebase.h index 1a8fa7d..9f7f2b2 100644 --- a/chrome/browser/parsers/metadata_parser_filebase.h +++ b/chrome/browser/parsers/metadata_parser_filebase.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/hash_tables.h" #include "chrome/browser/parsers/metadata_parser.h" diff --git a/chrome/browser/parsers/metadata_parser_filebase_unittest.cc b/chrome/browser/parsers/metadata_parser_filebase_unittest.cc index 0dc6237..170dd06 100644 --- a/chrome/browser/parsers/metadata_parser_filebase_unittest.cc +++ b/chrome/browser/parsers/metadata_parser_filebase_unittest.cc @@ -5,8 +5,8 @@ #include <map> #include <string> -#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/string_util.h" // TODO(brettw) remove when WideToASCII moves. #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/parsers/metadata_parser_jpeg_factory.cc b/chrome/browser/parsers/metadata_parser_jpeg_factory.cc index 16021c2..366ded3 100644 --- a/chrome/browser/parsers/metadata_parser_jpeg_factory.cc +++ b/chrome/browser/parsers/metadata_parser_jpeg_factory.cc @@ -4,7 +4,7 @@ #include "chrome/browser/parsers/metadata_parser_jpeg_factory.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "chrome/browser/parsers/metadata_parser_jpeg.h" diff --git a/chrome/browser/password_manager/login_database.cc b/chrome/browser/password_manager/login_database.cc index 078c417..aef1583 100644 --- a/chrome/browser/password_manager/login_database.cc +++ b/chrome/browser/password_manager/login_database.cc @@ -7,8 +7,8 @@ #include <algorithm> #include <limits> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/time.h" diff --git a/chrome/browser/password_manager/login_database.h b/chrome/browser/password_manager/login_database.h index b5e38ef..32e859c 100644 --- a/chrome/browser/password_manager/login_database.h +++ b/chrome/browser/password_manager/login_database.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "content/public/common/password_form.h" #include "sql/connection.h" diff --git a/chrome/browser/pepper_broker_infobar_delegate.h b/chrome/browser/pepper_broker_infobar_delegate.h index 93ac80f..694ddc6 100644 --- a/chrome/browser/pepper_broker_infobar_delegate.h +++ b/chrome/browser/pepper_broker_infobar_delegate.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_PEPPER_BROKER_INFOBAR_DELEGATE_H_ #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/performance_monitor/database.cc b/chrome/browser/performance_monitor/database.cc index 67095a0..de813f3 100644 --- a/chrome/browser/performance_monitor/database.cc +++ b/chrome/browser/performance_monitor/database.cc @@ -4,8 +4,8 @@ #include "chrome/browser/performance_monitor/database.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h" diff --git a/chrome/browser/performance_monitor/database.h b/chrome/browser/performance_monitor/database.h index 27db256..58d7cf7 100644 --- a/chrome/browser/performance_monitor/database.h +++ b/chrome/browser/performance_monitor/database.h @@ -5,11 +5,11 @@ #ifndef CHROME_BROWSER_PERFORMANCE_MONITOR_DATABASE_H_ #define CHROME_BROWSER_PERFORMANCE_MONITOR_DATABASE_H_ -#include <vector> #include <set> #include <string> +#include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/performance_monitor/database_unittest.cc b/chrome/browser/performance_monitor/database_unittest.cc index 100a435..752b064 100644 --- a/chrome/browser/performance_monitor/database_unittest.cc +++ b/chrome/browser/performance_monitor/database_unittest.cc @@ -6,8 +6,8 @@ #include <string> #include <vector> -#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/memory/scoped_ptr.h" #include "base/time.h" diff --git a/chrome/browser/performance_monitor/performance_monitor.h b/chrome/browser/performance_monitor/performance_monitor.h index 0da96d3..652b4ea 100644 --- a/chrome/browser/performance_monitor/performance_monitor.h +++ b/chrome/browser/performance_monitor/performance_monitor.h @@ -9,7 +9,7 @@ #include <string> #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" diff --git a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc index 105af28..5318242 100644 --- a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc +++ b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/platform_util_mac.mm b/chrome/browser/platform_util_mac.mm index 06ad9ac..083645a 100644 --- a/chrome/browser/platform_util_mac.mm +++ b/chrome/browser/platform_util_mac.mm @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> #include <CoreServices/CoreServices.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/mac/mac_logging.h" #include "base/mac/scoped_aedesc.h" diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_win.cc index 71b228f..4290009 100644 --- a/chrome/browser/platform_util_win.cc +++ b/chrome/browser/platform_util_win.cc @@ -11,8 +11,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.h b/chrome/browser/plugins/chrome_plugin_service_filter.h index bd0ffd4..74c1f7a 100644 --- a/chrome/browser/plugins/chrome_plugin_service_filter.h +++ b/chrome/browser/plugins/chrome_plugin_service_filter.h @@ -9,7 +9,7 @@ #include <set> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" diff --git a/chrome/browser/plugins/plugin_prefs.h b/chrome/browser/plugins/plugin_prefs.h index ebcd50b..4b2e18b 100644 --- a/chrome/browser/plugins/plugin_prefs.h +++ b/chrome/browser/plugins/plugin_prefs.h @@ -10,7 +10,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/prefs/pref_service.h" #include "base/prefs/public/pref_change_registrar.h" #include "base/synchronization/lock.h" diff --git a/chrome/browser/policy/app_pack_updater.h b/chrome/browser/policy/app_pack_updater.h index ddc3c56..4f45f63 100644 --- a/chrome/browser/policy/app_pack_updater.h +++ b/chrome/browser/policy/app_pack_updater.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/extensions/updater/extension_downloader_delegate.h" diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc index 465c5ba..bcf6d26 100644 --- a/chrome/browser/policy/browser_policy_connector.cc +++ b/chrome/browser/policy/browser_policy_connector.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/path_service.h" diff --git a/chrome/browser/policy/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud_policy_browsertest.cc index 4e0acda..27bcab8 100644 --- a/chrome/browser/policy/cloud_policy_browsertest.cc +++ b/chrome/browser/policy/cloud_policy_browsertest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #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/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/browser/policy/config_dir_policy_loader.h b/chrome/browser/policy/config_dir_policy_loader.h index a0dcc94..afdc8e6 100644 --- a/chrome/browser/policy/config_dir_policy_loader.h +++ b/chrome/browser/policy/config_dir_policy_loader.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_POLICY_CONFIG_DIR_POLICY_LOADER_H_ #define CHROME_BROWSER_POLICY_CONFIG_DIR_POLICY_LOADER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/file_path_watcher.h" #include "chrome/browser/policy/async_policy_loader.h" #include "chrome/browser/policy/policy_types.h" diff --git a/chrome/browser/policy/configuration_policy_handler.cc b/chrome/browser/policy/configuration_policy_handler.cc index aa088c3..07c20de 100644 --- a/chrome/browser/policy/configuration_policy_handler.cc +++ b/chrome/browser/policy/configuration_policy_handler.cc @@ -7,7 +7,7 @@ #include <algorithm> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/prefs/pref_value_map.h" diff --git a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc index daf6e45..2a8ac08 100644 --- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc +++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc @@ -4,7 +4,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/prefs/pref_store_observer_mock.h" diff --git a/chrome/browser/policy/enterprise_install_attributes.h b/chrome/browser/policy/enterprise_install_attributes.h index 3cf605c..2a52e08 100644 --- a/chrome/browser/policy/enterprise_install_attributes.h +++ b/chrome/browser/policy/enterprise_install_attributes.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/policy/cloud_policy_constants.h" namespace chromeos { diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 3b98fbd..57206ff 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/bind_helpers.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/memory/ref_counted.h" #include "base/path_service.h" diff --git a/chrome/browser/policy/policy_loader_mac.h b/chrome/browser/policy/policy_loader_mac.h index 61d0c2e..800491d 100644 --- a/chrome/browser/policy/policy_loader_mac.h +++ b/chrome/browser/policy/policy_loader_mac.h @@ -7,7 +7,7 @@ #include <CoreFoundation/CoreFoundation.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/file_path_watcher.h" #include "chrome/browser/policy/async_policy_loader.h" diff --git a/chrome/browser/policy/policy_path_parser.h b/chrome/browser/policy/policy_path_parser.h index 5afc099..5bf0345 100644 --- a/chrome/browser/policy/policy_path_parser.h +++ b/chrome/browser/policy/policy_path_parser.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" namespace policy { diff --git a/chrome/browser/policy/policy_path_parser_mac.mm b/chrome/browser/policy/policy_path_parser_mac.mm index f7ad216..44b56c5 100644 --- a/chrome/browser/policy/policy_path_parser_mac.mm +++ b/chrome/browser/policy/policy_path_parser_mac.mm @@ -5,10 +5,10 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" -#include "base/sys_string_conversions.h" #import "base/mac/scoped_nsautorelease_pool.h" +#include "base/sys_string_conversions.h" #include "policy/policy_constants.h" #import <Cocoa/Cocoa.h> diff --git a/chrome/browser/policy/policy_path_parser_unittest.cc b/chrome/browser/policy/policy_path_parser_unittest.cc index 916b03a..4e3b3d8 100644 --- a/chrome/browser/policy/policy_path_parser_unittest.cc +++ b/chrome/browser/policy/policy_path_parser_unittest.cc @@ -2,8 +2,8 @@ // 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 <chrome/browser/policy/policy_path_parser.h> +#include "base/files/file_path.h" +#include "chrome/browser/policy/policy_path_parser.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/policy/policy_prefs_browsertest.cc b/chrome/browser/policy/policy_prefs_browsertest.cc index 9751cb8..bce4fe0 100644 --- a/chrome/browser/policy/policy_prefs_browsertest.cc +++ b/chrome/browser/policy/policy_prefs_browsertest.cc @@ -9,8 +9,8 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" diff --git a/chrome/browser/policy/test/local_policy_test_server.h b/chrome/browser/policy/test/local_policy_test_server.h index 6370073..bc02bd9 100644 --- a/chrome/browser/policy/test/local_policy_test_server.h +++ b/chrome/browser/policy/test/local_policy_test_server.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/values.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/policy/user_cloud_policy_store.h b/chrome/browser/policy/user_cloud_policy_store.h index 79aa1b4..5b11766 100644 --- a/chrome/browser/policy/user_cloud_policy_store.h +++ b/chrome/browser/policy/user_cloud_policy_store.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/policy/user_cloud_policy_store_base.h" diff --git a/chrome/browser/policy/user_cloud_policy_store_chromeos.h b/chrome/browser/policy/user_cloud_policy_store_chromeos.h index 3679cc6..d66e09d 100644 --- a/chrome/browser/policy/user_cloud_policy_store_chromeos.h +++ b/chrome/browser/policy/user_cloud_policy_store_chromeos.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/policy/cloud_policy_validator.h" diff --git a/chrome/browser/policy/user_policy_disk_cache.h b/chrome/browser/policy/user_policy_disk_cache.h index 346b7dc..81466ef 100644 --- a/chrome/browser/policy/user_policy_disk_cache.h +++ b/chrome/browser/policy/user_policy_disk_cache.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_POLICY_USER_POLICY_DISK_CACHE_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/policy/user_policy_token_loader.h b/chrome/browser/policy/user_policy_token_loader.h index 7f32ead..86eac01 100644 --- a/chrome/browser/policy/user_policy_token_loader.h +++ b/chrome/browser/policy/user_policy_token_loader.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/popup_blocker_browsertest.cc b/chrome/browser/popup_blocker_browsertest.cc index d229ee1..151f70e 100644 --- a/chrome/browser/popup_blocker_browsertest.cc +++ b/chrome/browser/popup_blocker_browsertest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/path_service.h" #include "chrome/browser/autocomplete/autocomplete_match.h" diff --git a/chrome/browser/predictors/predictor_database.cc b/chrome/browser/predictors/predictor_database.cc index 346a7d1..69e088d 100644 --- a/chrome/browser/predictors/predictor_database.cc +++ b/chrome/browser/predictors/predictor_database.cc @@ -5,11 +5,11 @@ #include "chrome/browser/predictors/predictor_database.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" -#include "base/stringprintf.h" #include "base/metrics/histogram.h" +#include "base/stringprintf.h" #include "chrome/browser/predictors/autocomplete_action_predictor_table.h" #include "chrome/browser/predictors/resource_prefetch_predictor.h" #include "chrome/browser/predictors/resource_prefetch_predictor_tables.h" diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc index 505b5ea..792e2e8 100644 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc @@ -5,8 +5,8 @@ #include "chrome/browser/prefs/chrome_pref_service_factory.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/metrics/histogram.h" #include "base/prefs/default_pref_store.h" #include "base/prefs/json_pref_store.h" diff --git a/chrome/browser/prefs/pref_registry_syncable.cc b/chrome/browser/prefs/pref_registry_syncable.cc index 62e9969..3a34360 100644 --- a/chrome/browser/prefs/pref_registry_syncable.cc +++ b/chrome/browser/prefs/pref_registry_syncable.cc @@ -4,7 +4,7 @@ #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/prefs/default_pref_store.h" #include "base/string_number_conversions.h" #include "base/values.h" diff --git a/chrome/browser/prefs/pref_service_syncable.cc b/chrome/browser/prefs/pref_service_syncable.cc index 5d26e17..01db256 100644 --- a/chrome/browser/prefs/pref_service_syncable.cc +++ b/chrome/browser/prefs/pref_service_syncable.cc @@ -5,7 +5,7 @@ #include "chrome/browser/prefs/pref_service_syncable.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/prefs/default_pref_store.h" #include "base/prefs/overlay_user_pref_store.h" #include "base/prefs/pref_notifier_impl.h" diff --git a/chrome/browser/printing/print_dialog_cloud_interative_uitest.cc b/chrome/browser/printing/print_dialog_cloud_interative_uitest.cc index c2dfee7..709f544 100644 --- a/chrome/browser/printing/print_dialog_cloud_interative_uitest.cc +++ b/chrome/browser/printing/print_dialog_cloud_interative_uitest.cc @@ -8,8 +8,8 @@ #include <functional> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/singleton.h" #include "base/path_service.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/browser/printing/print_dialog_cloud_internal.h b/chrome/browser/printing/print_dialog_cloud_internal.h index 3c4ec0d..3e7cc9a 100644 --- a/chrome/browser/printing/print_dialog_cloud_internal.h +++ b/chrome/browser/printing/print_dialog_cloud_internal.h @@ -9,7 +9,7 @@ #include <vector> #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/printing/print_dialog_cloud_unittest.cc b/chrome/browser/printing/print_dialog_cloud_unittest.cc index 23d702d..6aff2c7 100644 --- a/chrome/browser/printing/print_dialog_cloud_unittest.cc +++ b/chrome/browser/printing/print_dialog_cloud_unittest.cc @@ -10,8 +10,8 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/path_service.h" diff --git a/chrome/browser/printing/print_dialog_gtk.h b/chrome/browser/printing/print_dialog_gtk.h index 587576e..06a14c7 100644 --- a/chrome/browser/printing/print_dialog_gtk.h +++ b/chrome/browser/printing/print_dialog_gtk.h @@ -9,7 +9,7 @@ #include <gtk/gtkunixprint.h> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/sequenced_task_runner_helpers.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/printing/printer_manager_dialog_win.cc b/chrome/browser/printing/printer_manager_dialog_win.cc index a1c0442..5e71976 100644 --- a/chrome/browser/printing/printer_manager_dialog_win.cc +++ b/chrome/browser/printing/printer_manager_dialog_win.cc @@ -8,7 +8,7 @@ #include <shellapi.h> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/threading/thread.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/printing/printing_layout_browsertest.cc b/chrome/browser/printing/printing_layout_browsertest.cc index 278a7f6..73053ac 100644 --- a/chrome/browser/printing/printing_layout_browsertest.cc +++ b/chrome/browser/printing/printing_layout_browsertest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/process_util.h" @@ -17,9 +17,9 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" +#include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/process_info_snapshot_mac_unittest.cc b/chrome/browser/process_info_snapshot_mac_unittest.cc index f6cf7b1..980dc91 100644 --- a/chrome/browser/process_info_snapshot_mac_unittest.cc +++ b/chrome/browser/process_info_snapshot_mac_unittest.cc @@ -10,7 +10,7 @@ #include <vector> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/process_util.h" diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h index 12ed1ab..0cded79 100644 --- a/chrome/browser/process_singleton.h +++ b/chrome/browser/process_singleton.h @@ -17,7 +17,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/process.h" diff --git a/chrome/browser/process_singleton_browsertest.cc b/chrome/browser/process_singleton_browsertest.cc index 9cb284c..82a6aa5 100644 --- a/chrome/browser/process_singleton_browsertest.cc +++ b/chrome/browser/process_singleton_browsertest.cc @@ -12,8 +12,8 @@ #include "base/bind.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/memory/ref_counted.h" #include "base/path_service.h" diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc index a077861..fecbda9 100644 --- a/chrome/browser/process_singleton_linux.cc +++ b/chrome/browser/process_singleton_linux.cc @@ -59,8 +59,8 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/path_service.h" diff --git a/chrome/browser/process_singleton_linux_unittest.cc b/chrome/browser/process_singleton_linux_unittest.cc index a922e6e..33102ab 100644 --- a/chrome/browser/process_singleton_linux_unittest.cc +++ b/chrome/browser/process_singleton_linux_unittest.cc @@ -14,7 +14,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/process_util.h" diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc index 62d3814..5f83a22 100644 --- a/chrome/browser/process_singleton_win.cc +++ b/chrome/browser/process_singleton_win.cc @@ -9,7 +9,7 @@ #include "base/base_paths.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/process_util.h" #include "base/stringprintf.h" diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc index 7baff3e..48cd3b1 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/prefs/json_pref_store.h" diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.h b/chrome/browser/profiles/off_the_record_profile_io_data.h index c4e3f8e..ed37d48 100644 --- a/chrome/browser/profiles/off_the_record_profile_io_data.h +++ b/chrome/browser/profiles/off_the_record_profile_io_data.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 9f6685e..b41fea5 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -9,8 +9,8 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/prefs/json_pref_store.h" diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h index 748ce2a..7ffa968 100644 --- a/chrome/browser/profiles/profile_impl.h +++ b/chrome/browser/profiles/profile_impl.h @@ -9,7 +9,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/profiles/profile_info_cache.h b/chrome/browser/profiles/profile_info_cache.h index 7a0398c..82545fd 100644 --- a/chrome/browser/profiles/profile_info_cache.h +++ b/chrome/browser/profiles/profile_info_cache.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/string16.h" diff --git a/chrome/browser/profiles/profile_info_interface.h b/chrome/browser/profiles/profile_info_interface.h index 9eabe05..4e3ed99 100644 --- a/chrome/browser/profiles/profile_info_interface.h +++ b/chrome/browser/profiles/profile_info_interface.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PROFILES_PROFILE_INFO_INTERFACE_H_ #define CHROME_BROWSER_PROFILES_PROFILE_INFO_INTERFACE_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" namespace gfx { diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h index 39c9c3b..c3baef0 100644 --- a/chrome/browser/profiles/profile_io_data.h +++ b/chrome/browser/profiles/profile_io_data.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/callback_forward.h" -#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/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index ac9191f..c08f9a1 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h index 8014d58..72510d9 100644 --- a/chrome/browser/profiles/profile_manager.h +++ b/chrome/browser/profiles/profile_manager.h @@ -11,7 +11,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/hash_tables.h" #include "base/memory/linked_ptr.h" diff --git a/chrome/browser/profiles/profile_metrics.cc b/chrome/browser/profiles/profile_metrics.cc index d1fb890..2e76e06 100644 --- a/chrome/browser/profiles/profile_metrics.cc +++ b/chrome/browser/profiles/profile_metrics.cc @@ -4,7 +4,7 @@ #include "chrome/browser/profiles/profile_metrics.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/profiles/profile_shortcut_manager.h b/chrome/browser/profiles/profile_shortcut_manager.h index dc814b1..e947b62 100644 --- a/chrome/browser/profiles/profile_shortcut_manager.h +++ b/chrome/browser/profiles/profile_shortcut_manager.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_PROFILES_PROFILE_SHORTCUT_MANAGER_H_ #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "chrome/browser/profiles/profile_info_cache.h" diff --git a/chrome/browser/profiles/storage_partition_descriptor.h b/chrome/browser/profiles/storage_partition_descriptor.h index e57e6c7..39bc769 100644 --- a/chrome/browser/profiles/storage_partition_descriptor.h +++ b/chrome/browser/profiles/storage_partition_descriptor.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PROFILES_STORAGE_PARTITION_DESCRIPTOR_H_ #define CHROME_BROWSER_PROFILES_STORAGE_PARTITION_DESCRIPTOR_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/hash_tables.h" // This structure combines a StoragePartition's on-disk path and a boolean for diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.h b/chrome/browser/renderer_host/chrome_render_message_filter.h index 1aa149e..b662517 100644 --- a/chrome/browser/renderer_host/chrome_render_message_filter.h +++ b/chrome/browser/renderer_host/chrome_render_message_filter.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc index 037985c..00ab995 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.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/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/waitable_event.h" diff --git a/chrome/browser/safe_browsing/download_protection_service.h b/chrome/browser/safe_browsing/download_protection_service.h index 8bd6696..0e42884 100644 --- a/chrome/browser/safe_browsing/download_protection_service.h +++ b/chrome/browser/safe_browsing/download_protection_service.h @@ -14,7 +14,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "chrome/browser/safe_browsing/database_manager.h" diff --git a/chrome/browser/safe_browsing/download_protection_service_unittest.cc b/chrome/browser/safe_browsing/download_protection_service_unittest.cc index 5af784c..66703fa 100644 --- a/chrome/browser/safe_browsing/download_protection_service_unittest.cc +++ b/chrome/browser/safe_browsing/download_protection_service_unittest.cc @@ -10,8 +10,8 @@ #include "base/base_paths.h" #include "base/bind.h" #include "base/callback.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/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/safe_browsing/local_safebrowsing_test_server.h b/chrome/browser/safe_browsing/local_safebrowsing_test_server.h index 719344e..e2515ae 100644 --- a/chrome/browser/safe_browsing/local_safebrowsing_test_server.h +++ b/chrome/browser/safe_browsing/local_safebrowsing_test_server.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "net/test/local_test_server.h" // Runs a Python-based safebrowsing test server on the same machine in which the diff --git a/chrome/browser/safe_browsing/safe_browsing_database.h b/chrome/browser/safe_browsing/safe_browsing_database.h index 576361c..27a7f8f 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database.h +++ b/chrome/browser/safe_browsing/safe_browsing_database.h @@ -8,7 +8,7 @@ #include <set> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h index 9d09b33..4e6fcdd4 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.h +++ b/chrome/browser/safe_browsing/safe_browsing_service.h @@ -12,7 +12,7 @@ #include <string> #include "base/callback.h" -#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/observer_list.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc index 75739ad..16745d6 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" diff --git a/chrome/browser/safe_browsing/sandboxed_zip_analyzer.h b/chrome/browser/safe_browsing/sandboxed_zip_analyzer.h index 4d4ac14..5936bc0 100644 --- a/chrome/browser/safe_browsing/sandboxed_zip_analyzer.h +++ b/chrome/browser/safe_browsing/sandboxed_zip_analyzer.h @@ -13,7 +13,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/platform_file.h" #include "content/public/browser/utility_process_host.h" diff --git a/chrome/browser/safe_browsing/signature_util_win.cc b/chrome/browser/safe_browsing/signature_util_win.cc index a4cf6a8..b512fca 100644 --- a/chrome/browser/safe_browsing/signature_util_win.cc +++ b/chrome/browser/safe_browsing/signature_util_win.cc @@ -8,7 +8,7 @@ #include <softpub.h> #include <wintrust.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "chrome/common/safe_browsing/csd.pb.h" diff --git a/chrome/browser/safe_browsing/signature_util_win_unittest.cc b/chrome/browser/safe_browsing/signature_util_win_unittest.cc index 8127e54..b6fb491 100644 --- a/chrome/browser/safe_browsing/signature_util_win_unittest.cc +++ b/chrome/browser/safe_browsing/signature_util_win_unittest.cc @@ -8,9 +8,9 @@ #include <vector> #include "base/base_paths.h" -#include "base/file_path.h" -#include "base/path_service.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" +#include "base/path_service.h" #include "chrome/common/safe_browsing/csd.pb.h" #include "net/base/x509_cert_types.h" #include "net/base/x509_certificate.h" diff --git a/chrome/browser/service/service_process_control.cc b/chrome/browser/service/service_process_control.cc index 94666b9..3f7b384 100644 --- a/chrome/browser/service/service_process_control.cc +++ b/chrome/browser/service/service_process_control.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process_util.h" #include "base/stl_util.h" #include "base/threading/thread.h" diff --git a/chrome/browser/sessions/base_session_service.h b/chrome/browser/sessions/base_session_service.h index d0fde8d..1d3fac2 100644 --- a/chrome/browser/sessions/base_session_service.h +++ b/chrome/browser/sessions/base_session_service.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/location.h" #include "base/memory/ref_counted.h" diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc index fa11e34..ea8df12 100644 --- a/chrome/browser/sessions/better_session_restore_browsertest.cc +++ b/chrome/browser/sessions/better_session_restore_browsertest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/sessions/persistent_tab_restore_service.cc b/chrome/browser/sessions/persistent_tab_restore_service.cc index 65cd91f..b8f704b 100644 --- a/chrome/browser/sessions/persistent_tab_restore_service.cc +++ b/chrome/browser/sessions/persistent_tab_restore_service.cc @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc index 5106ac9..5eae0aa 100644 --- a/chrome/browser/sessions/session_restore_browsertest.cc +++ b/chrome/browser/sessions/session_restore_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/sessions/tab_restore_browsertest.cc b/chrome/browser/sessions/tab_restore_browsertest.cc index fb8bf52..d57e6c1 100644 --- a/chrome/browser/sessions/tab_restore_browsertest.cc +++ b/chrome/browser/sessions/tab_restore_browsertest.cc @@ -4,7 +4,7 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/test/test_timeouts.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/browser/shell_integration.h b/chrome/browser/shell_integration.h index 6374ee2..a3e897c 100644 --- a/chrome/browser/shell_integration.h +++ b/chrome/browser/shell_integration.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/string16.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc index a42f16e..a97a072 100644 --- a/chrome/browser/shell_integration_linux.cc +++ b/chrome/browser/shell_integration_linux.cc @@ -17,8 +17,8 @@ #include "base/base_paths.h" #include "base/command_line.h" #include "base/environment.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/i18n/file_util_icu.h" #include "base/message_loop.h" diff --git a/chrome/browser/shell_integration_linux.h b/chrome/browser/shell_integration_linux.h index 50a4845..519895c 100644 --- a/chrome/browser/shell_integration_linux.h +++ b/chrome/browser/shell_integration_linux.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/shell_integration.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc index 25acceb..39ca70a 100644 --- a/chrome/browser/shell_integration_unittest.cc +++ b/chrome/browser/shell_integration_unittest.cc @@ -7,8 +7,8 @@ #include <cstdlib> #include <map> -#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/stl_util.h" diff --git a/chrome/browser/shell_integration_win_unittest.cc b/chrome/browser/shell_integration_win_unittest.cc index 56b7ae2..04b600d 100644 --- a/chrome/browser/shell_integration_win_unittest.cc +++ b/chrome/browser/shell_integration_win_unittest.cc @@ -6,8 +6,8 @@ #include <vector> -#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/strings/string_number_conversions.h" #include "base/test/test_shortcut_win.h" diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary.h b/chrome/browser/spellchecker/spellcheck_custom_dictionary.h index a8c9c83..3854156 100644 --- a/chrome/browser/spellchecker/spellcheck_custom_dictionary.h +++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h index 253f05c..9100849 100644 --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h @@ -7,7 +7,7 @@ #include "chrome/browser/spellchecker/spellcheck_dictionary.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" diff --git a/chrome/browser/ssl/ssl_client_certificate_selector_test.cc b/chrome/browser/ssl/ssl_client_certificate_selector_test.cc index d24e808..c2fd114 100644 --- a/chrome/browser/ssl/ssl_client_certificate_selector_test.cc +++ b/chrome/browser/ssl/ssl_client_certificate_selector_test.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ssl/ssl_client_certificate_selector_test.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/storage_monitor/disk_info_mac.h b/chrome/browser/storage_monitor/disk_info_mac.h index b362ecd..332d087 100644 --- a/chrome/browser/storage_monitor/disk_info_mac.h +++ b/chrome/browser/storage_monitor/disk_info_mac.h @@ -7,7 +7,7 @@ #include <CoreFoundation/CoreFoundation.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/storage_monitor/media_storage_util.h" namespace chrome { diff --git a/chrome/browser/storage_monitor/image_capture_device.h b/chrome/browser/storage_monitor/image_capture_device.h index 32b3727..6fc03fc 100644 --- a/chrome/browser/storage_monitor/image_capture_device.h +++ b/chrome/browser/storage_monitor/image_capture_device.h @@ -8,7 +8,7 @@ #import <Foundation/Foundation.h> #import <ImageCaptureCore/ImageCaptureCore.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/cocoa_protocols.h" #include "base/mac/foundation_util.h" #include "base/memory/ref_counted.h" diff --git a/chrome/browser/storage_monitor/image_capture_device_manager_unittest.mm b/chrome/browser/storage_monitor/image_capture_device_manager_unittest.mm index 8d3700d..683b98d 100644 --- a/chrome/browser/storage_monitor/image_capture_device_manager_unittest.mm +++ b/chrome/browser/storage_monitor/image_capture_device_manager_unittest.mm @@ -6,8 +6,8 @@ #import <Foundation/Foundation.h> #import <ImageCaptureCore/ImageCaptureCore.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/mac/foundation_util.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/storage_monitor/media_device_notifications_utils.h b/chrome/browser/storage_monitor/media_device_notifications_utils.h index 4bf61cd..31835fb 100644 --- a/chrome/browser/storage_monitor/media_device_notifications_utils.h +++ b/chrome/browser/storage_monitor/media_device_notifications_utils.h @@ -7,7 +7,7 @@ #ifndef CHROME_BROWSER_STORAGE_MONITOR_MEDIA_DEVICE_NOTIFICATIONS_UTILS_H_ #define CHROME_BROWSER_STORAGE_MONITOR_MEDIA_DEVICE_NOTIFICATIONS_UTILS_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" namespace chrome { diff --git a/chrome/browser/storage_monitor/media_device_notifications_utils_unittest.cc b/chrome/browser/storage_monitor/media_device_notifications_utils_unittest.cc index f4b0ce4..90db5a4 100644 --- a/chrome/browser/storage_monitor/media_device_notifications_utils_unittest.cc +++ b/chrome/browser/storage_monitor/media_device_notifications_utils_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/storage_monitor/media_device_notifications_utils.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 "chrome/browser/storage_monitor/removable_device_constants.h" diff --git a/chrome/browser/storage_monitor/media_storage_util.h b/chrome/browser/storage_monitor/media_storage_util.h index 092a2e9..a914810 100644 --- a/chrome/browser/storage_monitor/media_storage_util.h +++ b/chrome/browser/storage_monitor/media_storage_util.h @@ -13,7 +13,7 @@ #include "base/basictypes.h" #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" namespace chrome { diff --git a/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc b/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc index f510033..cfa7a93 100644 --- a/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc +++ b/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc @@ -4,7 +4,7 @@ #include "chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/stl_util.h" #include "base/string_split.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/storage_monitor/portable_device_watcher_win.cc b/chrome/browser/storage_monitor/portable_device_watcher_win.cc index 65626ec..6275349 100644 --- a/chrome/browser/storage_monitor/portable_device_watcher_win.cc +++ b/chrome/browser/storage_monitor/portable_device_watcher_win.cc @@ -11,7 +11,7 @@ #include <dbt.h> #include <portabledevice.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/stl_util.h" #include "base/string_util.h" diff --git a/chrome/browser/storage_monitor/removable_device_constants.h b/chrome/browser/storage_monitor/removable_device_constants.h index f68847b..7d32c9b 100644 --- a/chrome/browser/storage_monitor/removable_device_constants.h +++ b/chrome/browser/storage_monitor/removable_device_constants.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_STORAGE_MONITOR_REMOVABLE_DEVICE_CONSTANTS_H_ #define CHROME_BROWSER_STORAGE_MONITOR_REMOVABLE_DEVICE_CONSTANTS_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "build/build_config.h" diff --git a/chrome/browser/storage_monitor/removable_device_notifications_chromeos.cc b/chrome/browser/storage_monitor/removable_device_notifications_chromeos.cc index 4b14c35..7c679ce 100644 --- a/chrome/browser/storage_monitor/removable_device_notifications_chromeos.cc +++ b/chrome/browser/storage_monitor/removable_device_notifications_chromeos.cc @@ -6,7 +6,7 @@ #include "chrome/browser/storage_monitor/removable_device_notifications_chromeos.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/stl_util.h" #include "base/string_util.h" diff --git a/chrome/browser/storage_monitor/removable_device_notifications_linux.cc b/chrome/browser/storage_monitor/removable_device_notifications_linux.cc index ab541d6..ee62aea 100644 --- a/chrome/browser/storage_monitor/removable_device_notifications_linux.cc +++ b/chrome/browser/storage_monitor/removable_device_notifications_linux.cc @@ -13,7 +13,7 @@ #include "base/basictypes.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/metrics/histogram.h" #include "base/stl_util.h" #include "base/string_util.h" diff --git a/chrome/browser/storage_monitor/removable_storage_notifications.h b/chrome/browser/storage_monitor/removable_storage_notifications.h index 49e67b2..d31e0eb 100644 --- a/chrome/browser/storage_monitor/removable_storage_notifications.h +++ b/chrome/browser/storage_monitor/removable_storage_notifications.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_STORAGE_MONITOR_REMOVABLE_STORAGE_NOTIFICATIONS_H_ #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/observer_list_threadsafe.h" #include "base/string16.h" #include "base/synchronization/lock.h" diff --git a/chrome/browser/storage_monitor/test_volume_mount_watcher_win.cc b/chrome/browser/storage_monitor/test_volume_mount_watcher_win.cc index 5dd1d80..657d39c 100644 --- a/chrome/browser/storage_monitor/test_volume_mount_watcher_win.cc +++ b/chrome/browser/storage_monitor/test_volume_mount_watcher_win.cc @@ -7,7 +7,7 @@ #include "chrome/browser/storage_monitor/test_volume_mount_watcher_win.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" namespace chrome { namespace test { diff --git a/chrome/browser/storage_monitor/udev_util_linux.cc b/chrome/browser/storage_monitor/udev_util_linux.cc index e72640d..e6c62ba 100644 --- a/chrome/browser/storage_monitor/udev_util_linux.cc +++ b/chrome/browser/storage_monitor/udev_util_linux.cc @@ -4,7 +4,7 @@ #include "chrome/browser/storage_monitor/udev_util_linux.h" -#include "base/file_path.h" +#include "base/files/file_path.h" namespace chrome { diff --git a/chrome/browser/storage_monitor/volume_mount_watcher_win.h b/chrome/browser/storage_monitor/volume_mount_watcher_win.h index efe2938..7e74671 100644 --- a/chrome/browser/storage_monitor/volume_mount_watcher_win.h +++ b/chrome/browser/storage_monitor/volume_mount_watcher_win.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/string16.h" #include "base/threading/sequenced_worker_pool.h" diff --git a/chrome/browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc b/chrome/browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc index 6fd4dd3..27b3e91 100644 --- a/chrome/browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc +++ b/chrome/browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/sync/glue/chrome_extensions_activity_monitor.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/values.h" diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc index e689d6d..158ae2e 100644 --- a/chrome/browser/sync/glue/sync_backend_host.cc +++ b/chrome/browser/sync/glue/sync_backend_host.cc @@ -12,8 +12,8 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/metrics/histogram.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc b/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc index 311299c..5e4e1dc 100644 --- a/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc +++ b/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc @@ -5,7 +5,7 @@ #include <vector> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "chrome/browser/sync/glue/data_type_controller.h" diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc index 337b928..7016715 100644 --- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc @@ -12,8 +12,8 @@ #include <vector> #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" diff --git a/chrome/browser/sync/test/integration/preferences_helper.h b/chrome/browser/sync/test/integration/preferences_helper.h index a8144ca..ac122e6 100644 --- a/chrome/browser/sync/test/integration/preferences_helper.h +++ b/chrome/browser/sync/test/integration/preferences_helper.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_PREFERENCES_HELPER_H_ #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_PREFERENCES_HELPER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/values.h" #include <string> diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc index fe61af5..0175a9c 100644 --- a/chrome/browser/sync/test/integration/sync_extension_helper.cc +++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc @@ -4,8 +4,8 @@ #include "chrome/browser/sync/test/integration/sync_extension_helper.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/sync_file_system/drive_metadata_store.cc b/chrome/browser/sync_file_system/drive_metadata_store.cc index 22706b4..8c1f5ff 100644 --- a/chrome/browser/sync_file_system/drive_metadata_store.cc +++ b/chrome/browser/sync_file_system/drive_metadata_store.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/message_loop_proxy.h" #include "base/sequenced_task_runner.h" diff --git a/chrome/browser/sync_file_system/drive_metadata_store.h b/chrome/browser/sync_file_system/drive_metadata_store.h index 8b818c9..a04af40 100644 --- a/chrome/browser/sync_file_system/drive_metadata_store.h +++ b/chrome/browser/sync_file_system/drive_metadata_store.h @@ -10,7 +10,7 @@ #include <vector> #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/sync_file_system/drive_metadata_store_unittest.cc b/chrome/browser/sync_file_system/drive_metadata_store_unittest.cc index c28024b..ebdc415 100644 --- a/chrome/browser/sync_file_system/drive_metadata_store_unittest.cc +++ b/chrome/browser/sync_file_system/drive_metadata_store_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/sync_file_system/drive_metadata_store.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/single_thread_task_runner.h" diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index d3341f2..2951ceb 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/task_manager/task_manager.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" diff --git a/chrome/browser/task_profiler/auto_tracking.h b/chrome/browser/task_profiler/auto_tracking.h index 343f8f65..5c88fad 100644 --- a/chrome/browser/task_profiler/auto_tracking.h +++ b/chrome/browser/task_profiler/auto_tracking.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_TASK_PROFILER_AUTO_TRACKING_H_ #define CHROME_BROWSER_TASK_PROFILER_AUTO_TRACKING_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/tracked_objects.h" //------------------------------------------------------------------------------ diff --git a/chrome/browser/task_profiler/task_profiler_data_serializer.cc b/chrome/browser/task_profiler/task_profiler_data_serializer.cc index ed9440f..fcef2ae 100644 --- a/chrome/browser/task_profiler/task_profiler_data_serializer.cc +++ b/chrome/browser/task_profiler/task_profiler_data_serializer.cc @@ -4,8 +4,8 @@ #include "chrome/browser/task_profiler/task_profiler_data_serializer.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_string_value_serializer.h" #include "base/time.h" #include "base/tracked_objects.h" diff --git a/chrome/browser/themes/theme_syncable_service_unittest.cc b/chrome/browser/themes/theme_syncable_service_unittest.cc index 2d268cc..dc84d56 100644 --- a/chrome/browser/themes/theme_syncable_service_unittest.cc +++ b/chrome/browser/themes/theme_syncable_service_unittest.cc @@ -6,20 +6,20 @@ #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" -#include "chrome/common/extensions/extension_manifest_constants.h" #include "chrome/common/extensions/extension.h" +#include "chrome/common/extensions/extension_manifest_constants.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" -#include "sync/api/sync_error_factory_mock.h" #include "sync/api/sync_error.h" +#include "sync/api/sync_error_factory_mock.h" #include "sync/protocol/sync.pb.h" #include "sync/protocol/theme_specifics.pb.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/app_list/app_list_util.h b/chrome/browser/ui/app_list/app_list_util.h index 789eeea..41ac242 100644 --- a/chrome/browser/ui/app_list/app_list_util.h +++ b/chrome/browser/ui/app_list/app_list_util.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_UTIL_H_ #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_UTIL_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" class PrefRegistrySimple; class Profile; diff --git a/chrome/browser/ui/app_list/apps_model_builder_unittest.cc b/chrome/browser/ui/app_list/apps_model_builder_unittest.cc index 01b1daa..af154d2 100644 --- a/chrome/browser/ui/app_list/apps_model_builder_unittest.cc +++ b/chrome/browser/ui/app_list/apps_model_builder_unittest.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service_unittest.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc index d790fc6..8f8d23e 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc @@ -11,7 +11,7 @@ #include "ash/launcher/launcher_model.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser_unittest.cc index cbd84fa..d8f89a0 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser_unittest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser_unittest.cc @@ -11,7 +11,7 @@ #include "ash/launcher/launcher_model.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/values.h" diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc index 4e82bc1..9ca03c1 100644 --- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc @@ -6,7 +6,7 @@ #include "ash/ash_switches.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/stringprintf.h" #include "base/time.h" #include "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h" diff --git a/chrome/browser/ui/ash/screenshot_taker.cc b/chrome/browser/ui/ash/screenshot_taker.cc index 8d38b4b..52182d6 100644 --- a/chrome/browser/ui/ash/screenshot_taker.cc +++ b/chrome/browser/ui/ash/screenshot_taker.cc @@ -11,8 +11,8 @@ #include "ash/shell_delegate.h" #include "ash/shell_window_ids.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/stringprintf.h" diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 3908a6a..40215ab 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/prefs/pref_service.h" #include "base/sys_info.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/chrome_select_file_policy_unittest.cc b/chrome/browser/ui/chrome_select_file_policy_unittest.cc index 9a1bb2c..d5a6c10 100644 --- a/chrome/browser/ui/chrome_select_file_policy_unittest.cc +++ b/chrome/browser/ui/chrome_select_file_policy_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/ui/chrome_select_file_policy.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/prefs/pref_service.h" #include "base/string16.h" diff --git a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm index 9e16e05..7bf0063 100644 --- a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/applescript/tab_applescript.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #import "base/memory/scoped_nsobject.h" #include "base/sys_string_conversions.h" diff --git a/chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.h b/chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.h index e8c61ea..a91db0d 100644 --- a/chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.h +++ b/chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.h @@ -9,7 +9,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chrome_to_mobile_service.h" diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.mm index 8f1c603..f408c55 100644 --- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.mm +++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/location.h" #import "base/mac/foundation_util.h" #include "base/native_library.h" diff --git a/chrome/browser/ui/cocoa/download/download_item_button.h b/chrome/browser/ui/cocoa/download/download_item_button.h index a4af812..ecc2ee3 100644 --- a/chrome/browser/ui/cocoa/download/download_item_button.h +++ b/chrome/browser/ui/cocoa/download/download_item_button.h @@ -4,7 +4,7 @@ #import <Cocoa/Cocoa.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #import "chrome/browser/ui/cocoa/draggable_button.h" @class DownloadItemController; diff --git a/chrome/browser/ui/cocoa/download/download_item_cell.h b/chrome/browser/ui/cocoa/download/download_item_cell.h index 0284012..c73f9c8 100644 --- a/chrome/browser/ui/cocoa/download/download_item_cell.h +++ b/chrome/browser/ui/cocoa/download/download_item_cell.h @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/gradient_button_cell.h" -#include "base/file_path.h" +#include "base/files/file_path.h" class DownloadItemModel; @class IndeterminateProgressTimer; diff --git a/chrome/browser/ui/cocoa/download/download_util_mac_unittest.mm b/chrome/browser/ui/cocoa/download/download_util_mac_unittest.mm index f97cddf..f2cc313 100644 --- a/chrome/browser/ui/cocoa/download/download_util_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/download/download_util_mac_unittest.mm @@ -4,7 +4,7 @@ // Download utility test for Mac OS X. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/ui/cocoa/drag_util.mm b/chrome/browser/ui/cocoa/drag_util.mm index b79db4d..98a9d5f 100644 --- a/chrome/browser/ui/cocoa/drag_util.mm +++ b/chrome/browser/ui/cocoa/drag_util.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/drag_util.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/plugin_service.h" #include "content/public/common/url_constants.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm index d9a3a1b..bfc82e4 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm @@ -4,8 +4,8 @@ #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm index 495ca2d..2f93349 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm @@ -4,8 +4,8 @@ #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm index 14c81fe..6c150bf 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm @@ -6,8 +6,8 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/values.h" diff --git a/chrome/browser/ui/extensions/application_launch.h b/chrome/browser/ui/extensions/application_launch.h index 75ca97d..09230cf 100644 --- a/chrome/browser/ui/extensions/application_launch.h +++ b/chrome/browser/ui/extensions/application_launch.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_EXTENSIONS_APPLICATION_LAUNCH_H_ #define CHROME_BROWSER_UI_EXTENSIONS_APPLICATION_LAUNCH_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/common/extensions/extension_constants.h" #include "googleurl/src/gurl.h" #include "ui/base/window_open_disposition.h" diff --git a/chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.h b/chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.h index 3c5f10f..fcb5eea 100644 --- a/chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.h +++ b/chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.h @@ -16,7 +16,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chrome_to_mobile_service.h" diff --git a/chrome/browser/ui/gtk/custom_drag.cc b/chrome/browser/ui/gtk/custom_drag.cc index ed48990..f813ba2 100644 --- a/chrome/browser/ui/gtk/custom_drag.cc +++ b/chrome/browser/ui/gtk/custom_drag.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/gtk/custom_drag.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h" #include "content/public/browser/download_item.h" diff --git a/chrome/browser/ui/hung_plugin_tab_helper.h b/chrome/browser/ui/hung_plugin_tab_helper.h index 51feb42..eb37379 100644 --- a/chrome/browser/ui/hung_plugin_tab_helper.h +++ b/chrome/browser/ui/hung_plugin_tab_helper.h @@ -7,7 +7,7 @@ #include <map> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/linked_ptr.h" #include "base/string16.h" #include "base/time.h" diff --git a/chrome/browser/ui/metro_pin_tab_helper_win.cc b/chrome/browser/ui/metro_pin_tab_helper_win.cc index 93a5828..f5078f3 100644 --- a/chrome/browser/ui/metro_pin_tab_helper_win.cc +++ b/chrome/browser/ui/metro_pin_tab_helper_win.cc @@ -8,8 +8,8 @@ #include "base/base_paths.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" diff --git a/chrome/browser/ui/network_profile_bubble.cc b/chrome/browser/ui/network_profile_bubble.cc index aa09b14..3fcdbab 100644 --- a/chrome/browser/ui/network_profile_bubble.cc +++ b/chrome/browser/ui/network_profile_bubble.cc @@ -12,8 +12,8 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc index 8239f22..ff86e6f 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc @@ -12,7 +12,7 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/environment.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator.h b/chrome/browser/ui/startup/startup_browser_creator.h index 91da5e4..07652c1 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.h +++ b/chrome/browser/ui/startup/startup_browser_creator.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc index 6e32f48..933a7ac 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/prefs/pref_service.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.h b/chrome/browser/ui/startup/startup_browser_creator_impl.h index 4a0905c..91c1edf 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.h +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "chrome/browser/ui/startup/startup_tab.h" #include "chrome/browser/ui/startup/startup_types.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc b/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc index 9b906ae..77da246 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc @@ -5,7 +5,7 @@ #include <vector> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/session_startup_pref.h" diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc index 0a0b962..981293d 100644 --- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc @@ -7,8 +7,8 @@ #include <map> #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/stl_util.h" diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.h b/chrome/browser/ui/toolbar/wrench_menu_model.h index b78ab62..72acf00 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.h +++ b/chrome/browser/ui/toolbar/wrench_menu_model.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ #define CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "content/public/browser/host_zoom_map.h" diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc index accf174..fbec838 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/break_iterator.h" #include "base/i18n/rtl.h" #include "base/metrics/histogram.h" diff --git a/chrome/browser/ui/views/find_bar_controller_browsertest.cc b/chrome/browser/ui/views/find_bar_controller_browsertest.cc index 9d65b95..a4171d7 100644 --- a/chrome/browser/ui/views/find_bar_controller_browsertest.cc +++ b/chrome/browser/ui/views/find_bar_controller_browsertest.cc @@ -4,9 +4,9 @@ #include "chrome/browser/ui/find_bar/find_bar_controller.h" -#include "base/file_path.h" -#include "chrome/browser/ui/browser_commands.h" +#include "base/files/file_path.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/find_bar/find_bar_host_unittest_util.h" #include "chrome/test/base/in_process_browser_test.h" diff --git a/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc b/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc index 635031f..1383534 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/select_file_dialog_extension.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/shell_dialogs/selected_file_info.h" diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc index 8bb9c44..85f161b 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc @@ -3,15 +3,15 @@ // found in the LICENSE file. #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/synchronization/waitable_event.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ssl/ssl_client_auth_requestor_mock.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/views/ssl_client_certificate_selector.h" -#include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/in_process_browser_test.h" +#include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" diff --git a/chrome/browser/ui/views/user_data_dir_dialog_view.h b/chrome/browser/ui/views/user_data_dir_dialog_view.h index 2902c6e8..0355e30 100644 --- a/chrome/browser/ui/views/user_data_dir_dialog_view.h +++ b/chrome/browser/ui/views/user_data_dir_dialog_view.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "ui/shell_dialogs/select_file_dialog.h" #include "ui/views/window/dialog_delegate.h" diff --git a/chrome/browser/ui/views/web_dialog_view_browsertest.cc b/chrome/browser/ui/views/web_dialog_view_browsertest.cc index 9b72c9e..37fe1c7 100644 --- a/chrome/browser/ui/views/web_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/web_dialog_view_browsertest.cc @@ -4,7 +4,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/singleton.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc index 9bbd3b4..c509cdf 100644 --- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc +++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/rtl.h" #include "base/string16.h" #include "base/utf_string_conversions.h" @@ -17,9 +17,9 @@ #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "content/public/browser/web_ui_message_handler.h" +#include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" -#include "googleurl/src/gurl.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/text/bytes_formatting.h" diff --git a/chrome/browser/ui/webui/extensions/install_extension_handler.h b/chrome/browser/ui/webui/extensions/install_extension_handler.h index c029d9a..2795bdc 100644 --- a/chrome/browser/ui/webui/extensions/install_extension_handler.h +++ b/chrome/browser/ui/webui/extensions/install_extension_handler.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_INSTALL_EXTENSION_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_INSTALL_EXTENSION_HANDLER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/values.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/fileicon_source.cc b/chrome/browser/ui/webui/fileicon_source.cc index af8135a..b0d4609 100644 --- a/chrome/browser/ui/webui/fileicon_source.cc +++ b/chrome/browser/ui/webui/fileicon_source.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted_memory.h" #include "base/message_loop.h" #include "base/string_split.h" diff --git a/chrome/browser/ui/webui/fileicon_source.h b/chrome/browser/ui/webui/fileicon_source.h index ce8e54c..dc50207 100644 --- a/chrome/browser/ui/webui/fileicon_source.h +++ b/chrome/browser/ui/webui/fileicon_source.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/icon_manager.h" #include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/url_data_source.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index 16bc518..e86d541 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -14,8 +14,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/platform_file.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc index fb97774..c88584d 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/prerender/prerender_manager.h" diff --git a/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc b/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc index 522acaf..954a875a 100644 --- a/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc +++ b/chrome/browser/ui/webui/ntp/most_visited_browsertest.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/file_path.h" +#include "base/files/file_path.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" #include "chrome/test/base/web_ui_browsertest.h" diff --git a/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc b/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc index 48dd6c9..ca04485 100644 --- a/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc +++ b/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/nix/xdg_util.h" #include "base/process_util.h" #include "base/string_util.h" diff --git a/chrome/browser/ui/webui/print_preview/sticky_settings.cc b/chrome/browser/ui/webui/print_preview/sticky_settings.cc index 1203db6..e487e83 100644 --- a/chrome/browser/ui/webui/print_preview/sticky_settings.cc +++ b/chrome/browser/ui/webui/print_preview/sticky_settings.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/prefs/pref_registry_syncable.h" diff --git a/chrome/browser/ui/webui/screenshot_source.cc b/chrome/browser/ui/webui/screenshot_source.cc index 30f7123..19e8003 100644 --- a/chrome/browser/ui/webui/screenshot_source.cc +++ b/chrome/browser/ui/webui/screenshot_source.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/i18n/time_formatting.h" #include "base/memory/ref_counted_memory.h" #include "base/message_loop.h" diff --git a/chrome/browser/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector_impl.cc index 3934b9d..d359197 100644 --- a/chrome/browser/upgrade_detector_impl.cc +++ b/chrome/browser/upgrade_detector_impl.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/build_time.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/metrics/field_trial.h" diff --git a/chrome/browser/user_style_sheet_watcher.h b/chrome/browser/user_style_sheet_watcher.h index 4fae4b1..baad82d 100644 --- a/chrome/browser/user_style_sheet_watcher.h +++ b/chrome/browser/user_style_sheet_watcher.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_USER_STYLE_SHEET_WATCHER_H_ #define CHROME_BROWSER_USER_STYLE_SHEET_WATCHER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/file_path_watcher.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/value_store/leveldb_value_store.h b/chrome/browser/value_store/leveldb_value_store.h index 95ae6dc..da8edbc 100644 --- a/chrome/browser/value_store/leveldb_value_store.h +++ b/chrome/browser/value_store/leveldb_value_store.h @@ -9,7 +9,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/value_store/value_store.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" diff --git a/chrome/browser/value_store/value_store_frontend.cc b/chrome/browser/value_store/value_store_frontend.cc index aca3fff..e53e1d1 100644 --- a/chrome/browser/value_store/value_store_frontend.cc +++ b/chrome/browser/value_store/value_store_frontend.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/debug/trace_event.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "chrome/browser/value_store/leveldb_value_store.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/web_applications/web_app.h b/chrome/browser/web_applications/web_app.h index deab896..ced6064 100644 --- a/chrome/browser/web_applications/web_app.h +++ b/chrome/browser/web_applications/web_app.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "build/build_config.h" #include "chrome/browser/shell_integration.h" #include "chrome/common/web_apps.h" diff --git a/chrome/browser/web_applications/web_app_mac.h b/chrome/browser/web_applications/web_app_mac.h index 5e06cdc..177142a 100644 --- a/chrome/browser/web_applications/web_app_mac.h +++ b/chrome/browser/web_applications/web_app_mac.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_WEB_APPLICATIONS_WEB_APP_MAC_H_ #define CHROME_BROWSER_WEB_APPLICATIONS_WEB_APP_MAC_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/string16.h" #include "chrome/browser/shell_integration.h" diff --git a/chrome/browser/web_applications/web_app_unittest.cc b/chrome/browser/web_applications/web_app_unittest.cc index 2a8c082..0bd1c01 100644 --- a/chrome/browser/web_applications/web_app_unittest.cc +++ b/chrome/browser/web_applications/web_app_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/web_applications/web_app.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/tab_helper.h" diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h index ed80d76..07048fc 100644 --- a/chrome/browser/webdata/web_data_service.h +++ b/chrome/browser/webdata/web_data_service.h @@ -14,7 +14,7 @@ #include <vector> #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/sequenced_task_runner_helpers.h" diff --git a/chrome/browser/webdata/web_data_service_factory.cc b/chrome/browser/webdata/web_data_service_factory.cc index 5d641d7..8c6e03f 100644 --- a/chrome/browser/webdata/web_data_service_factory.cc +++ b/chrome/browser/webdata/web_data_service_factory.cc @@ -4,7 +4,7 @@ #include "chrome/browser/webdata/web_data_service_factory.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/webdata/autofill_web_data_service_impl.h" #include "chrome/browser/webdata/web_data_service.h" diff --git a/chrome/common/auto_start_linux.cc b/chrome/common/auto_start_linux.cc index d212aaf..bc8b666 100644 --- a/chrome/common/auto_start_linux.cc +++ b/chrome/common/auto_start_linux.cc @@ -5,8 +5,8 @@ #include "chrome/common/auto_start_linux.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/nix/xdg_util.h" #include "base/strings/string_tokenizer.h" diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc index c06d0b8..7a67f83 100644 --- a/chrome/common/chrome_constants.cc +++ b/chrome/common/chrome_constants.cc @@ -4,7 +4,7 @@ #include "chrome/common/chrome_constants.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #define FPL FILE_PATH_LITERAL diff --git a/chrome/common/chrome_constants.h b/chrome/common/chrome_constants.h index c236c3c..40feb7c 100644 --- a/chrome/common/chrome_constants.h +++ b/chrome/common/chrome_constants.h @@ -7,7 +7,7 @@ #ifndef CHROME_COMMON_CHROME_CONSTANTS_H_ #define CHROME_COMMON_CHROME_CONSTANTS_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" namespace chrome { diff --git a/chrome/common/chrome_paths_android.cc b/chrome/common/chrome_paths_android.cc index a69b250..1cee68a 100644 --- a/chrome/common/chrome_paths_android.cc +++ b/chrome/common/chrome_paths_android.cc @@ -4,7 +4,7 @@ #include "chrome/common/chrome_paths_internal.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" diff --git a/chrome/common/chrome_paths_unittest.cc b/chrome/common/chrome_paths_unittest.cc index 9f7441f..5d97afc 100644 --- a/chrome/common/chrome_paths_unittest.cc +++ b/chrome/common/chrome_paths_unittest.cc @@ -6,8 +6,8 @@ #include <stdlib.h> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "chrome/common/chrome_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/chrome_paths_win.cc b/chrome/common/chrome_paths_win.cc index b3e7eff..2bab2da 100644 --- a/chrome/common/chrome_paths_win.cc +++ b/chrome/common/chrome_paths_win.cc @@ -10,7 +10,7 @@ #include <shlobj.h> #include <shobjidl.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/win/metro.h" #include "base/win/scoped_co_mem.h" diff --git a/chrome/common/chrome_utility_messages.h b/chrome/common/chrome_utility_messages.h index e2976c2..f5c6636 100644 --- a/chrome/common/chrome_utility_messages.h +++ b/chrome/common/chrome_utility_messages.h @@ -8,8 +8,8 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/platform_file.h" #include "base/values.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/common/chrome_version_info_win.cc b/chrome/common/chrome_version_info_win.cc index a8ff8c8..01b8e47 100644 --- a/chrome/common/chrome_version_info_win.cc +++ b/chrome/common/chrome_version_info_win.cc @@ -5,11 +5,11 @@ #include "chrome/common/chrome_version_info.h" #include "base/base_paths.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string_util.h" -#include "chrome/installer/util/install_util.h" #include "chrome/installer/util/google_update_settings.h" +#include "chrome/installer/util/install_util.h" namespace chrome { diff --git a/chrome/common/extensions/api/extension_api_unittest.cc b/chrome/common/extensions/api/extension_api_unittest.cc index ee169dc..39d9481 100644 --- a/chrome/common/extensions/api/extension_api_unittest.cc +++ b/chrome/common/extensions/api/extension_api_unittest.cc @@ -7,8 +7,8 @@ #include <string> #include <vector> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_writer.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index 6dadfcd..b8f18f7 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -7,8 +7,8 @@ #include "base/base64.h" #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/memory/singleton.h" diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h index fb7f3c8..ebe669c3 100644 --- a/chrome/common/extensions/extension.h +++ b/chrome/common/extensions/extension.h @@ -13,7 +13,7 @@ #include <utility> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/hash_tables.h" #include "base/memory/linked_ptr.h" diff --git a/chrome/common/extensions/extension_builder.h b/chrome/common/extensions/extension_builder.h index 65cb453..1591a05 100644 --- a/chrome/common/extensions/extension_builder.h +++ b/chrome/common/extensions/extension_builder.h @@ -5,7 +5,7 @@ #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_BUILDER_H_ #define CHROME_COMMON_EXTENSIONS_EXTENSION_BUILDER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/common/extensions/manifest.h" diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc index d0c422f..0a3a36b 100644 --- a/chrome/common/extensions/extension_file_util.cc +++ b/chrome/common/extensions/extension_file_util.cc @@ -7,8 +7,8 @@ #include <map> #include <vector> -#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/json/json_file_value_serializer.h" #include "base/logging.h" diff --git a/chrome/common/extensions/extension_l10n_util_unittest.cc b/chrome/common/extensions/extension_l10n_util_unittest.cc index 3e00552..d11da97 100644 --- a/chrome/common/extensions/extension_l10n_util_unittest.cc +++ b/chrome/common/extensions/extension_l10n_util_unittest.cc @@ -2,8 +2,8 @@ // 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/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/common/extensions/extension_resource.h b/chrome/common/extensions/extension_resource.h index aca0d3d..a8d632c 100644 --- a/chrome/common/extensions/extension_resource.h +++ b/chrome/common/extensions/extension_resource.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" // Represents a resource inside an extension. For example, an image, or a // JavaScript file. This is more complicated than just a simple FilePath diff --git a/chrome/common/extensions/extension_set_unittest.cc b/chrome/common/extensions/extension_set_unittest.cc index cf1e8ad..1703966 100644 --- a/chrome/common/extensions/extension_set_unittest.cc +++ b/chrome/common/extensions/extension_set_unittest.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/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc index 83bd39f..2d0d059 100644 --- a/chrome/common/extensions/extension_unittest.cc +++ b/chrome/common/extensions/extension_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/common/extensions/extension.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/format_macros.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" diff --git a/chrome/common/extensions/manifest_handler_unittest.cc b/chrome/common/extensions/manifest_handler_unittest.cc index dec16eb..2cad12e 100644 --- a/chrome/common/extensions/manifest_handler_unittest.cc +++ b/chrome/common/extensions/manifest_handler_unittest.cc @@ -5,7 +5,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/common/extensions/manifest_tests/extension_manifest_test.cc b/chrome/common/extensions/manifest_tests/extension_manifest_test.cc index 800f0a0..b4ce528 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifest_test.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifest_test.cc @@ -4,11 +4,11 @@ #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" -#include "base/file_path.h" #include "base/file_util.h" -#include "base/values.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" +#include "base/values.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/manifest_handler.h" diff --git a/chrome/common/extensions/unpacker.h b/chrome/common/extensions/unpacker.h index b63a325..f101aa7 100644 --- a/chrome/common/extensions/unpacker.h +++ b/chrome/common/extensions/unpacker.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/tuple.h" #include "chrome/common/extensions/manifest.h" diff --git a/chrome/common/extensions/user_script.h b/chrome/common/extensions/user_script.h index df12959..49632e5 100644 --- a/chrome/common/extensions/user_script.h +++ b/chrome/common/extensions/user_script.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_piece.h" #include "extensions/common/url_pattern.h" #include "extensions/common/url_pattern_set.h" diff --git a/chrome/common/extensions/user_script_unittest.cc b/chrome/common/extensions/user_script_unittest.cc index 4b97d85..9c10b3c 100644 --- a/chrome/common/extensions/user_script_unittest.cc +++ b/chrome/common/extensions/user_script_unittest.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/file_path.h" +#include "base/files/file_path.h" #include "base/pickle.h" #include "chrome/common/extensions/user_script.h" #include "googleurl/src/gurl.h" diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc index 9fb6ac1..896cc7b 100644 --- a/chrome/common/logging_chrome.cc +++ b/chrome/common/logging_chrome.cc @@ -34,8 +34,8 @@ #include "base/compiler_specific.h" #include "base/debug/debugger.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/string_util.h" diff --git a/chrome/common/mac/app_mode_chrome_locator.mm b/chrome/common/mac/app_mode_chrome_locator.mm index 292099d..458d279 100644 --- a/chrome/common/mac/app_mode_chrome_locator.mm +++ b/chrome/common/mac/app_mode_chrome_locator.mm @@ -7,7 +7,7 @@ #import <AppKit/AppKit.h> #include <CoreFoundation/CoreFoundation.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/foundation_util.h" #include "base/sys_string_conversions.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/common/mac/app_mode_chrome_locator_unittest.mm b/chrome/common/mac/app_mode_chrome_locator_unittest.mm index 69ea8a8..c924111 100644 --- a/chrome/common/mac/app_mode_chrome_locator_unittest.mm +++ b/chrome/common/mac/app_mode_chrome_locator_unittest.mm @@ -6,8 +6,8 @@ #include <CoreFoundation/CoreFoundation.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/path_service.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/common/mac/app_mode_common.h b/chrome/common/mac/app_mode_common.h index 2aef955..e4ccb04 100644 --- a/chrome/common/mac/app_mode_common.h +++ b/chrome/common/mac/app_mode_common.h @@ -7,7 +7,7 @@ #import <Foundation/Foundation.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" // This file contains constants, interfaces, etc. which are common to the diff --git a/chrome/common/mac/mock_launchd.cc b/chrome/common/mac/mock_launchd.cc index c6c196d..3330c86 100644 --- a/chrome/common/mac/mock_launchd.cc +++ b/chrome/common/mac/mock_launchd.cc @@ -9,8 +9,8 @@ #include <sys/un.h> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/mac/foundation_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/message_loop.h" diff --git a/chrome/common/mac/mock_launchd.h b/chrome/common/mac/mock_launchd.h index 0b52622..b88b23a5 100644 --- a/chrome/common/mac/mock_launchd.h +++ b/chrome/common/mac/mock_launchd.h @@ -9,7 +9,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/scoped_cftyperef.h" #include "base/memory/scoped_ptr.h" #include "chrome/common/mac/launchd.h" diff --git a/chrome/common/net/x509_certificate_model_unittest.cc b/chrome/common/net/x509_certificate_model_unittest.cc index 5b40b659..4a08f4c 100644 --- a/chrome/common/net/x509_certificate_model_unittest.cc +++ b/chrome/common/net/x509_certificate_model_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/common/net/x509_certificate_model.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "net/base/cert_test_util.h" #include "net/base/nss_cert_database.h" diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index 8bcdc7c..3c84692 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process.h" #include "base/shared_memory.h" #include "base/string16.h" diff --git a/chrome/common/safe_browsing/download_protection_util.cc b/chrome/common/safe_browsing/download_protection_util.cc index 3d4b560..88d5cab 100644 --- a/chrome/common/safe_browsing/download_protection_util.cc +++ b/chrome/common/safe_browsing/download_protection_util.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/file_path.h" +#include "base/files/file_path.h" namespace safe_browsing { namespace download_protection_util { diff --git a/chrome/common/service_process_util_mac.mm b/chrome/common/service_process_util_mac.mm index 9ab7b08..025f33c 100644 --- a/chrome/common/service_process_util_mac.mm +++ b/chrome/common/service_process_util_mac.mm @@ -11,8 +11,8 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/mac/bundle_locations.h" #include "base/mac/foundation_util.h" #include "base/mac/mac_util.h" @@ -20,8 +20,8 @@ #include "base/memory/scoped_nsobject.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/stringprintf.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/sys_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "base/version.h" diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc index 8fbccbb..8322c5d 100644 --- a/chrome/common/service_process_util_unittest.cc +++ b/chrome/common/service_process_util_unittest.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process_util.h" #if !defined(OS_MACOSX) @@ -239,8 +239,8 @@ MULTIPROCESS_TEST_MAIN(ServiceProcessStateTestShutdown) { #include <CoreFoundation/CoreFoundation.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/mac/mac_util.h" #include "base/test/test_timeouts.h" diff --git a/chrome/common/spellcheck_common.cc b/chrome/common/spellcheck_common.cc index 07ddc49a..0f0282e 100644 --- a/chrome/common/spellcheck_common.cc +++ b/chrome/common/spellcheck_common.cc @@ -4,7 +4,7 @@ #include "chrome/common/spellcheck_common.h" -#include "base/file_path.h" +#include "base/files/file_path.h" namespace chrome { namespace spellcheck_common { diff --git a/chrome/common/switch_utils_unittest.cc b/chrome/common/switch_utils_unittest.cc index b522d91..a228ed5 100644 --- a/chrome/common/switch_utils_unittest.cc +++ b/chrome/common/switch_utils_unittest.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "testing/gtest/include/gtest/gtest.h" TEST(SwitchUtilsTest, RemoveSwitches) { diff --git a/chrome/common/web_apps_unittest.cc b/chrome/common/web_apps_unittest.cc index dbf04ab9..01f39f3 100644 --- a/chrome/common/web_apps_unittest.cc +++ b/chrome/common/web_apps_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/common/web_apps.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/common/zip.h b/chrome/common/zip.h index 26c5fec..da8175f 100644 --- a/chrome/common/zip.h +++ b/chrome/common/zip.h @@ -6,7 +6,7 @@ #define CHROME_COMMON_ZIP_H_ #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" namespace zip { diff --git a/chrome/common/zip_reader.h b/chrome/common/zip_reader.h index 49396d0..ff4d443 100644 --- a/chrome/common/zip_reader.h +++ b/chrome/common/zip_reader.h @@ -8,8 +8,8 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" #include "base/time.h" diff --git a/chrome/installer/gcapi/gcapi.cc b/chrome/installer/gcapi/gcapi.cc index 29e2072..51acd3e 100644 --- a/chrome/installer/gcapi/gcapi.cc +++ b/chrome/installer/gcapi/gcapi.cc @@ -24,8 +24,8 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/process_util.h" #include "base/string16.h" #include "base/string_util.h" diff --git a/chrome/installer/launcher_support/chrome_launcher_support.cc b/chrome/installer/launcher_support/chrome_launcher_support.cc index 8731d71..8f0bee5 100644 --- a/chrome/installer/launcher_support/chrome_launcher_support.cc +++ b/chrome/installer/launcher_support/chrome_launcher_support.cc @@ -8,8 +8,8 @@ #include <tchar.h> #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/string16.h" #include "base/win/registry.h" diff --git a/chrome/installer/mini_installer/decompress_test.cc b/chrome/installer/mini_installer/decompress_test.cc index d531cf9..1592bb4 100644 --- a/chrome/installer/mini_installer/decompress_test.cc +++ b/chrome/installer/mini_installer/decompress_test.cc @@ -4,7 +4,7 @@ #include <windows.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "chrome/installer/mini_installer/decompress.h" diff --git a/chrome/installer/setup/chrome_frame_ready_mode.cc b/chrome/installer/setup/chrome_frame_ready_mode.cc index fb6ed36..c8a98c4 100644 --- a/chrome/installer/setup/chrome_frame_ready_mode.cc +++ b/chrome/installer/setup/chrome_frame_ready_mode.cc @@ -5,7 +5,7 @@ #include "chrome/installer/setup/chrome_frame_ready_mode.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/string_util.h" diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc index b0e447e..53dbbed 100644 --- a/chrome/installer/setup/install.cc +++ b/chrome/installer/setup/install.cc @@ -12,8 +12,8 @@ #include <string> #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/installer/setup/install_unittest.cc b/chrome/installer/setup/install_unittest.cc index 9c7f331..7dfbf0c 100644 --- a/chrome/installer/setup/install_unittest.cc +++ b/chrome/installer/setup/install_unittest.cc @@ -6,8 +6,8 @@ #include <string> -#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/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc index 414b8b3..5450e32 100644 --- a/chrome/installer/setup/install_worker.cc +++ b/chrome/installer/setup/install_worker.cc @@ -15,8 +15,8 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc index 1f4cbd5..9f112c0 100644 --- a/chrome/installer/setup/setup_util.cc +++ b/chrome/installer/setup/setup_util.cc @@ -9,8 +9,8 @@ #include <windows.h> #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/process_util.h" #include "base/string_util.h" diff --git a/chrome/installer/test/alternate_version_generator.cc b/chrome/installer/test/alternate_version_generator.cc index 5bec8b1..9e54561 100644 --- a/chrome/installer/test/alternate_version_generator.cc +++ b/chrome/installer/test/alternate_version_generator.cc @@ -33,8 +33,8 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/platform_file.h" diff --git a/chrome/installer/test/alternate_version_generator_main.cc b/chrome/installer/test/alternate_version_generator_main.cc index b49e3d2..2227e74 100644 --- a/chrome/installer/test/alternate_version_generator_main.cc +++ b/chrome/installer/test/alternate_version_generator_main.cc @@ -11,8 +11,8 @@ #include "base/at_exit.h" #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "chrome/installer/test/alternate_version_generator.h" diff --git a/chrome/installer/test/resource_loader.cc b/chrome/installer/test/resource_loader.cc index 463c35b..fc4ce55 100644 --- a/chrome/installer/test/resource_loader.cc +++ b/chrome/installer/test/resource_loader.cc @@ -6,7 +6,7 @@ #include <windows.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" namespace { diff --git a/chrome/installer/test/resource_updater.cc b/chrome/installer/test/resource_updater.cc index 2deb301..c308add 100644 --- a/chrome/installer/test/resource_updater.cc +++ b/chrome/installer/test/resource_updater.cc @@ -6,8 +6,8 @@ #include <windows.h> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" namespace upgrade_test { diff --git a/chrome/installer/test/upgrade_test.cc b/chrome/installer/test/upgrade_test.cc index 87e9eef..ee02414 100644 --- a/chrome/installer/test/upgrade_test.cc +++ b/chrome/installer/test/upgrade_test.cc @@ -5,8 +5,8 @@ // Boilerplate for an upgrade scenario test. The mini_installer.exe residing in // the same directory as the host executable is re-versioned. -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "chrome/installer/test/alternate_version_generator.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/installer/util/auto_launch_util.cc b/chrome/installer/util/auto_launch_util.cc index 4e2d292..60ef370 100644 --- a/chrome/installer/util/auto_launch_util.cc +++ b/chrome/installer/util/auto_launch_util.cc @@ -5,7 +5,7 @@ #include "chrome/installer/util/auto_launch_util.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc index aa53f97..bde7d20a 100644 --- a/chrome/installer/util/browser_distribution.cc +++ b/chrome/installer/util/browser_distribution.cc @@ -11,9 +11,9 @@ #include "base/atomicops.h" #include "base/command_line.h" -#include "base/file_path.h" -#include "base/path_service.h" +#include "base/files/file_path.h" #include "base/logging.h" +#include "base/path_service.h" #include "base/win/registry.h" #include "base/win/windows_version.h" #include "chrome/common/env_vars.h" diff --git a/chrome/installer/util/browser_distribution.h b/chrome/installer/util/browser_distribution.h index ff4890a..025a708 100644 --- a/chrome/installer/util/browser_distribution.h +++ b/chrome/installer/util/browser_distribution.h @@ -10,7 +10,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "base/version.h" #include "chrome/installer/util/util_constants.h" diff --git a/chrome/installer/util/chrome_app_host_operations.cc b/chrome/installer/util/chrome_app_host_operations.cc index 0597a38..caa7d7e 100644 --- a/chrome/installer/util/chrome_app_host_operations.cc +++ b/chrome/installer/util/chrome_app_host_operations.cc @@ -5,7 +5,7 @@ #include "chrome/installer/util/chrome_app_host_operations.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "chrome/common/chrome_switches.h" #include "chrome/installer/util/browser_distribution.h" diff --git a/chrome/installer/util/chrome_binaries_operations.cc b/chrome/installer/util/chrome_binaries_operations.cc index d4f5d8b..9a00805 100644 --- a/chrome/installer/util/chrome_binaries_operations.cc +++ b/chrome/installer/util/chrome_binaries_operations.cc @@ -5,7 +5,7 @@ #include "chrome/installer/util/chrome_binaries_operations.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "chrome/installer/util/channel_info.h" #include "chrome/installer/util/helper.h" diff --git a/chrome/installer/util/chrome_browser_operations.cc b/chrome/installer/util/chrome_browser_operations.cc index ed77f57..1f23261 100644 --- a/chrome/installer/util/chrome_browser_operations.cc +++ b/chrome/installer/util/chrome_browser_operations.cc @@ -5,8 +5,8 @@ #include "chrome/installer/util/chrome_browser_operations.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/string_util.h" #include "chrome/installer/util/browser_distribution.h" diff --git a/chrome/installer/util/chrome_frame_operations.cc b/chrome/installer/util/chrome_frame_operations.cc index 7f47288..5783da9 100644 --- a/chrome/installer/util/chrome_frame_operations.cc +++ b/chrome/installer/util/chrome_frame_operations.cc @@ -5,7 +5,7 @@ #include "chrome/installer/util/chrome_frame_operations.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "chrome/installer/util/channel_info.h" #include "chrome/installer/util/helper.h" diff --git a/chrome/installer/util/conditional_work_item_list.h b/chrome/installer/util/conditional_work_item_list.h index 1358f82..1e90a78 100644 --- a/chrome/installer/util/conditional_work_item_list.h +++ b/chrome/installer/util/conditional_work_item_list.h @@ -7,7 +7,7 @@ #include "chrome/installer/util/work_item_list.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" // A WorkItemList subclass that permits conditionally executing a set of diff --git a/chrome/installer/util/copy_tree_work_item.h b/chrome/installer/util/copy_tree_work_item.h index d79e618..af01cf5 100644 --- a/chrome/installer/util/copy_tree_work_item.h +++ b/chrome/installer/util/copy_tree_work_item.h @@ -5,7 +5,7 @@ #ifndef CHROME_INSTALLER_UTIL_COPY_TREE_WORK_ITEM_H_ #define CHROME_INSTALLER_UTIL_COPY_TREE_WORK_ITEM_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/gtest_prod_util.h" #include "chrome/installer/util/work_item.h" diff --git a/chrome/installer/util/create_dir_work_item.h b/chrome/installer/util/create_dir_work_item.h index ef344be9..83d3d05 100644 --- a/chrome/installer/util/create_dir_work_item.h +++ b/chrome/installer/util/create_dir_work_item.h @@ -7,7 +7,7 @@ #include <windows.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/installer/util/work_item.h" // A WorkItem subclass that creates a directory with the specified path. diff --git a/chrome/installer/util/delete_reg_value_work_item_unittest.cc b/chrome/installer/util/delete_reg_value_work_item_unittest.cc index 29181aa..35d11a2 100644 --- a/chrome/installer/util/delete_reg_value_work_item_unittest.cc +++ b/chrome/installer/util/delete_reg_value_work_item_unittest.cc @@ -4,7 +4,7 @@ #include <windows.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/string_util.h" #include "base/win/registry.h" diff --git a/chrome/installer/util/delete_tree_work_item.h b/chrome/installer/util/delete_tree_work_item.h index 0de100b..3907ac2 100644 --- a/chrome/installer/util/delete_tree_work_item.h +++ b/chrome/installer/util/delete_tree_work_item.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "chrome/installer/util/work_item.h" diff --git a/chrome/installer/util/fake_installation_state.h b/chrome/installer/util/fake_installation_state.h index b10814e..c81cc5b 100644 --- a/chrome/installer/util/fake_installation_state.h +++ b/chrome/installer/util/fake_installation_state.h @@ -5,7 +5,7 @@ #ifndef CHROME_INSTALLER_UTIL_FAKE_INSTALLATION_STATE_H_ #define CHROME_INSTALLER_UTIL_FAKE_INSTALLATION_STATE_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/version.h" #include "chrome/installer/util/fake_product_state.h" #include "chrome/installer/util/helper.h" diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc index 925e876..508ce8d 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -14,7 +14,7 @@ #include <vector> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/installer/util/google_chrome_distribution_dummy.cc b/chrome/installer/util/google_chrome_distribution_dummy.cc index 1d75ea2..5ac90f7 100644 --- a/chrome/installer/util/google_chrome_distribution_dummy.cc +++ b/chrome/installer/util/google_chrome_distribution_dummy.cc @@ -12,7 +12,7 @@ #include <windows.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/values.h" diff --git a/chrome/installer/util/google_update_util.cc b/chrome/installer/util/google_update_util.cc index 1d39d67..5219ac8 100644 --- a/chrome/installer/util/google_update_util.cc +++ b/chrome/installer/util/google_update_util.cc @@ -11,8 +11,8 @@ #include "base/command_line.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/process_util.h" #include "base/string16.h" diff --git a/chrome/installer/util/helper.cc b/chrome/installer/util/helper.cc index 52580a4..bb0f22e 100644 --- a/chrome/installer/util/helper.cc +++ b/chrome/installer/util/helper.cc @@ -4,14 +4,14 @@ #include "chrome/installer/util/helper.h" +#include "base/files/file_path.h" #include "base/logging.h" -#include "base/file_path.h" #include "base/path_service.h" #include "base/win/windows_version.h" #include "chrome/common/chrome_constants.h" #include "chrome/installer/util/browser_distribution.h" -#include "chrome/installer/util/installation_state.h" #include "chrome/installer/util/install_util.h" +#include "chrome/installer/util/installation_state.h" #include "chrome/installer/util/util_constants.h" namespace { diff --git a/chrome/installer/util/install_util.h b/chrome/installer/util/install_util.h index 2d161e5..55071fc 100644 --- a/chrome/installer/util/install_util.h +++ b/chrome/installer/util/install_util.h @@ -9,12 +9,12 @@ #ifndef CHROME_INSTALLER_UTIL_INSTALL_UTIL_H_ #define CHROME_INSTALLER_UTIL_INSTALL_UTIL_H_ -#include <tchar.h> #include <windows.h> +#include <tchar.h> #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "base/win/scoped_handle.h" #include "chrome/installer/util/browser_distribution.h" diff --git a/chrome/installer/util/installation_state.h b/chrome/installer/util/installation_state.h index 76ebef9..30097d5 100644 --- a/chrome/installer/util/installation_state.h +++ b/chrome/installer/util/installation_state.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "chrome/installer/util/app_commands.h" #include "chrome/installer/util/browser_distribution.h" diff --git a/chrome/installer/util/installation_validator_unittest.cc b/chrome/installer/util/installation_validator_unittest.cc index 9e1ff90..16a2e2b 100644 --- a/chrome/installer/util/installation_validator_unittest.cc +++ b/chrome/installer/util/installation_validator_unittest.cc @@ -5,7 +5,7 @@ #include <map> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/version.h" diff --git a/chrome/installer/util/installer_state.h b/chrome/installer/util/installer_state.h index 93ba4a0..47df2b4 100644 --- a/chrome/installer/util/installer_state.h +++ b/chrome/installer/util/installer_state.h @@ -10,7 +10,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" diff --git a/chrome/installer/util/installer_state_unittest.cc b/chrome/installer/util/installer_state_unittest.cc index a67f2a08..5395a84 100644 --- a/chrome/installer/util/installer_state_unittest.cc +++ b/chrome/installer/util/installer_state_unittest.cc @@ -8,8 +8,8 @@ #include "base/base_paths.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/path_service.h" #include "base/process_util.h" diff --git a/chrome/installer/util/installer_util_test_common.cc b/chrome/installer/util/installer_util_test_common.cc index 716b9df..005a160 100644 --- a/chrome/installer/util/installer_util_test_common.cc +++ b/chrome/installer/util/installer_util_test_common.cc @@ -7,7 +7,7 @@ #include <windows.h> #include <shellapi.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" namespace installer { diff --git a/chrome/installer/util/logging_installer.cc b/chrome/installer/util/logging_installer.cc index f11ec13..adc7801 100644 --- a/chrome/installer/util/logging_installer.cc +++ b/chrome/installer/util/logging_installer.cc @@ -7,8 +7,8 @@ #include "chrome/installer/util/logging_installer.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/logging_win.h" #include "base/path_service.h" diff --git a/chrome/installer/util/logging_installer_unittest.cc b/chrome/installer/util/logging_installer_unittest.cc index 9a9fdb9..722897e 100644 --- a/chrome/installer/util/logging_installer_unittest.cc +++ b/chrome/installer/util/logging_installer_unittest.cc @@ -4,8 +4,8 @@ #include <string> -#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/platform_file.h" #include "base/win/scoped_handle.h" diff --git a/chrome/installer/util/move_tree_work_item.h b/chrome/installer/util/move_tree_work_item.h index cd8c513..371182d 100644 --- a/chrome/installer/util/move_tree_work_item.h +++ b/chrome/installer/util/move_tree_work_item.h @@ -5,7 +5,7 @@ #ifndef CHROME_INSTALLER_UTIL_MOVE_TREE_WORK_ITEM_H_ #define CHROME_INSTALLER_UTIL_MOVE_TREE_WORK_ITEM_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/gtest_prod_util.h" #include "chrome/installer/util/work_item.h" diff --git a/chrome/installer/util/product_operations.h b/chrome/installer/util/product_operations.h index 7531d69..77d094b 100644 --- a/chrome/installer/util/product_operations.h +++ b/chrome/installer/util/product_operations.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/installer/util/shell_util.h" class BrowserDistribution; diff --git a/chrome/installer/util/product_unittest.h b/chrome/installer/util/product_unittest.h index 05c903c..a8e9afb 100644 --- a/chrome/installer/util/product_unittest.h +++ b/chrome/installer/util/product_unittest.h @@ -7,8 +7,8 @@ #include <windows.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/path_service.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/installer/util/self_cleaning_temp_dir.h b/chrome/installer/util/self_cleaning_temp_dir.h index c2fb972..e473aec 100644 --- a/chrome/installer/util/self_cleaning_temp_dir.h +++ b/chrome/installer/util/self_cleaning_temp_dir.h @@ -6,7 +6,7 @@ #define CHROME_INSTALLER_UTIL_SELF_CLEANING_TEMP_DIR_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" namespace installer { diff --git a/chrome/installer/util/set_reg_value_work_item_unittest.cc b/chrome/installer/util/set_reg_value_work_item_unittest.cc index 4d6bb3d..c1a4bce 100644 --- a/chrome/installer/util/set_reg_value_work_item_unittest.cc +++ b/chrome/installer/util/set_reg_value_work_item_unittest.cc @@ -4,7 +4,7 @@ #include <windows.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/string_util.h" #include "base/win/registry.h" diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc index b60176d..0bc6353 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -16,8 +16,8 @@ #include <string> #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/md5.h" diff --git a/chrome/installer/util/shell_util.h b/chrome/installer/util/shell_util.h index 726d0c5..bfdb9b9 100644 --- a/chrome/installer/util/shell_util.h +++ b/chrome/installer/util/shell_util.h @@ -15,7 +15,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/string16.h" #include "chrome/installer/util/work_item_list.h" diff --git a/chrome/installer/util/work_item_list.cc b/chrome/installer/util/work_item_list.cc index 6eaa4df..fd00773 100644 --- a/chrome/installer/util/work_item_list.cc +++ b/chrome/installer/util/work_item_list.cc @@ -4,17 +4,17 @@ #include "chrome/installer/util/work_item_list.h" +#include "base/files/file_path.h" #include "base/logging.h" -#include "base/file_path.h" -#include "chrome/installer/util/logging_installer.h" #include "chrome/installer/util/callback_work_item.h" #include "chrome/installer/util/copy_reg_key_work_item.h" #include "chrome/installer/util/copy_tree_work_item.h" #include "chrome/installer/util/create_dir_work_item.h" #include "chrome/installer/util/create_reg_key_work_item.h" -#include "chrome/installer/util/delete_tree_work_item.h" #include "chrome/installer/util/delete_reg_key_work_item.h" #include "chrome/installer/util/delete_reg_value_work_item.h" +#include "chrome/installer/util/delete_tree_work_item.h" +#include "chrome/installer/util/logging_installer.h" #include "chrome/installer/util/move_tree_work_item.h" #include "chrome/installer/util/self_reg_work_item.h" #include "chrome/installer/util/set_reg_value_work_item.h" diff --git a/chrome/nacl/nacl_main_platform_delegate_mac.mm b/chrome/nacl/nacl_main_platform_delegate_mac.mm index 9d86db4..e304ea7 100644 --- a/chrome/nacl/nacl_main_platform_delegate_mac.mm +++ b/chrome/nacl/nacl_main_platform_delegate_mac.mm @@ -6,7 +6,7 @@ #import <Cocoa/Cocoa.h> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/native_library.h" #include "chrome/common/chrome_sandbox_type_mac.h" diff --git a/chrome/nacl/nacl_main_platform_delegate_win.cc b/chrome/nacl/nacl_main_platform_delegate_win.cc index 24bd555..abd9b3e 100644 --- a/chrome/nacl/nacl_main_platform_delegate_win.cc +++ b/chrome/nacl/nacl_main_platform_delegate_win.cc @@ -5,7 +5,7 @@ #include "chrome/nacl/nacl_main_platform_delegate.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/native_library.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/plugin/chrome_content_plugin_client.cc b/chrome/plugin/chrome_content_plugin_client.cc index 2060503..32e4ea7 100644 --- a/chrome/plugin/chrome_content_plugin_client.cc +++ b/chrome/plugin/chrome_content_plugin_client.cc @@ -5,8 +5,8 @@ #include "chrome/plugin/chrome_content_plugin_client.h" #if defined(ENABLE_REMOTING) +#include "base/files/file_path.h" #include "base/path_service.h" -#include "base/file_path.h" #include "content/public/common/content_paths.h" #include "media/base/media.h" #if defined(OS_WIN) diff --git a/chrome/renderer/chrome_render_process_observer.h b/chrome/renderer/chrome_render_process_observer.h index 49356c9..5b82156 100644 --- a/chrome/renderer/chrome_render_process_observer.h +++ b/chrome/renderer/chrome_render_process_observer.h @@ -8,7 +8,7 @@ #include <string> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "chrome/common/content_settings.h" #include "content/public/renderer/render_process_observer.h" diff --git a/chrome/renderer/extensions/media_galleries_custom_bindings.cc b/chrome/renderer/extensions/media_galleries_custom_bindings.cc index 73119b29..4a6ede5 100644 --- a/chrome/renderer/extensions/media_galleries_custom_bindings.cc +++ b/chrome/renderer/extensions/media_galleries_custom_bindings.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/stringprintf.h" #include "chrome/common/extensions/extension_constants.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" diff --git a/chrome/renderer/safe_browsing/scorer_unittest.cc b/chrome/renderer/safe_browsing/scorer_unittest.cc index c9c18c2..a9a9218 100644 --- a/chrome/renderer/safe_browsing/scorer_unittest.cc +++ b/chrome/renderer/safe_browsing/scorer_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/renderer/safe_browsing/scorer.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/format_macros.h" #include "base/hash_tables.h" diff --git a/chrome/service/cloud_print/print_system_cups.cc b/chrome/service/cloud_print/print_system_cups.cc index d343de9..df0d5dc 100644 --- a/chrome/service/cloud_print/print_system_cups.cc +++ b/chrome/service/cloud_print/print_system_cups.cc @@ -14,7 +14,7 @@ #include <map> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/md5.h" diff --git a/chrome/service/cloud_print/print_system_win.cc b/chrome/service/cloud_print/print_system_win.cc index 3d1fdfe..903d192 100644 --- a/chrome/service/cloud_print/print_system_win.cc +++ b/chrome/service/cloud_print/print_system_win.cc @@ -9,8 +9,8 @@ #include <xpsprint.h> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/utf_string_conversions.h" #include "base/win/object_watcher.h" diff --git a/chrome/service/cloud_print/printer_job_handler.h b/chrome/service/cloud_print/printer_job_handler.h index 510136d..f2ab6ef 100644 --- a/chrome/service/cloud_print/printer_job_handler.h +++ b/chrome/service/cloud_print/printer_job_handler.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/message_loop_proxy.h" diff --git a/chrome/service/cloud_print/printer_job_handler_unittest.cc b/chrome/service/cloud_print/printer_job_handler_unittest.cc index 05595ab..62aed09 100644 --- a/chrome/service/cloud_print/printer_job_handler_unittest.cc +++ b/chrome/service/cloud_print/printer_job_handler_unittest.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/file_path.h" +#include "base/files/file_path.h" #include "base/md5.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/service/service_utility_process_host.cc b/chrome/service/service_utility_process_host.cc index 4895ca5..18e1663 100644 --- a/chrome/service/service_utility_process_host.cc +++ b/chrome/service/service_utility_process_host.cc @@ -24,7 +24,7 @@ #include "ui/gfx/rect.h" #if defined(OS_WIN) -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/win/scoped_handle.h" #include "printing/emf_win.h" diff --git a/chrome/service/service_utility_process_host.h b/chrome/service/service_utility_process_host.h index d34247b..9be55d7 100644 --- a/chrome/service/service_utility_process_host.h +++ b/chrome/service/service_utility_process_host.h @@ -11,7 +11,7 @@ #include <vector> #include "base/basictypes.h" -#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/process.h" diff --git a/chrome/test/automation/automation_json_requests.cc b/chrome/test/automation/automation_json_requests.cc index 56a3afd..fdfe3bb 100644 --- a/chrome/test/automation/automation_json_requests.cc +++ b/chrome/test/automation/automation_json_requests.cc @@ -5,7 +5,7 @@ #include "chrome/test/automation/automation_json_requests.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/format_macros.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h" diff --git a/chrome/test/automation/automation_json_requests.h b/chrome/test/automation/automation_json_requests.h index 120a542..df24832 100644 --- a/chrome/test/automation/automation_json_requests.h +++ b/chrome/test/automation/automation_json_requests.h @@ -9,7 +9,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/strings/string_number_conversions.h" #include "chrome/common/automation_constants.h" #include "chrome/common/automation_id.h" diff --git a/chrome/test/base/chrome_test_suite.h b/chrome/test/base/chrome_test_suite.h index ac786ae..9186f28 100644 --- a/chrome/test/base/chrome_test_suite.h +++ b/chrome/test/base/chrome_test_suite.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "content/public/test/content_test_suite_base.h" diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc index cbda548..e56a1e7 100644 --- a/chrome/test/base/in_process_browser_test.cc +++ b/chrome/test/base/in_process_browser_test.cc @@ -7,8 +7,8 @@ #include "base/auto_reset.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/test/base/interactive_test_utils_win.cc b/chrome/test/base/interactive_test_utils_win.cc index 970fd1d..4b68f23 100644 --- a/chrome/test/base/interactive_test_utils_win.cc +++ b/chrome/test/base/interactive_test_utils_win.cc @@ -4,8 +4,8 @@ #include "chrome/test/base/interactive_test_utils.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/stringprintf.h" diff --git a/chrome/test/base/test_launcher_utils.h b/chrome/test/base/test_launcher_utils.h index a026746..242be69 100644 --- a/chrome/test/base/test_launcher_utils.h +++ b/chrome/test/base/test_launcher_utils.h @@ -8,7 +8,7 @@ #include <string> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" class CommandLine; diff --git a/chrome/test/base/testing_profile_manager.cc b/chrome/test/base/testing_profile_manager.cc index 7228cac..481d9ba 100644 --- a/chrome/test/base/testing_profile_manager.cc +++ b/chrome/test/base/testing_profile_manager.cc @@ -4,7 +4,7 @@ #include "chrome/test/base/testing_profile_manager.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile_info_cache.h" diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index e0a1a88..884de82 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -12,8 +12,8 @@ #include "base/bind_helpers.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/json/json_reader.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" diff --git a/chrome/test/base/v8_unit_test.h b/chrome/test/base/v8_unit_test.h index 9279aab..f5cb59e 100644 --- a/chrome/test/base/v8_unit_test.h +++ b/chrome/test/base/v8_unit_test.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_piece.h" #include "testing/gtest/include/gtest/gtest.h" #include "v8/include/v8.h" diff --git a/chrome/test/base/web_ui_browsertest.h b/chrome/test/base/web_ui_browsertest.h index 1744725..8386c51 100644 --- a/chrome/test/base/web_ui_browsertest.h +++ b/chrome/test/base/web_ui_browsertest.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_vector.h" #include "base/string16.h" #include "chrome/test/base/in_process_browser_test.h" diff --git a/chrome/test/chromedriver/chrome_android_impl.cc b/chrome/test/chromedriver/chrome_android_impl.cc index 53d4ddf..def60c7 100644 --- a/chrome/test/chromedriver/chrome_android_impl.cc +++ b/chrome/test/chromedriver/chrome_android_impl.cc @@ -5,7 +5,7 @@ #include "chrome/test/chromedriver/chrome_android_impl.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process_util.h" #include "base/string_number_conversions.h" #include "chrome/test/chromedriver/net/sync_websocket_impl.h" diff --git a/chrome/test/chromedriver/chrome_desktop_impl.cc b/chrome/test/chromedriver/chrome_desktop_impl.cc index ea8ee27..a6233c4 100644 --- a/chrome/test/chromedriver/chrome_desktop_impl.cc +++ b/chrome/test/chromedriver/chrome_desktop_impl.cc @@ -5,7 +5,7 @@ #include "chrome/test/chromedriver/chrome_desktop_impl.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process.h" #include "base/process_util.h" #include "base/string_number_conversions.h" diff --git a/chrome/test/chromedriver/chrome_finder.cc b/chrome/test/chromedriver/chrome_finder.cc index 0d5c8d7..4a6e420 100644 --- a/chrome/test/chromedriver/chrome_finder.cc +++ b/chrome/test/chromedriver/chrome_finder.cc @@ -11,8 +11,8 @@ #include "base/bind.h" #include "base/callback.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" diff --git a/chrome/test/chromedriver/chrome_finder_mac.mm b/chrome/test/chromedriver/chrome_finder_mac.mm index 5a07d65..f2fe490 100644 --- a/chrome/test/chromedriver/chrome_finder_mac.mm +++ b/chrome/test/chromedriver/chrome_finder_mac.mm @@ -4,7 +4,7 @@ #import <Foundation/Foundation.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/foundation_util.h" void GetApplicationDirs(std::vector<base::FilePath>* app_dirs) { diff --git a/chrome/test/chromedriver/chrome_finder_unittest.cc b/chrome/test/chromedriver/chrome_finder_unittest.cc index d912f91..7815c7e 100644 --- a/chrome/test/chromedriver/chrome_finder_unittest.cc +++ b/chrome/test/chromedriver/chrome_finder_unittest.cc @@ -6,7 +6,7 @@ #include <vector> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/test/chromedriver/chrome_finder.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/test/chromedriver/chrome_launcher_impl.cc b/chrome/test/chromedriver/chrome_launcher_impl.cc index da65a07..e811582 100644 --- a/chrome/test/chromedriver/chrome_launcher_impl.cc +++ b/chrome/test/chromedriver/chrome_launcher_impl.cc @@ -7,7 +7,7 @@ #include <string> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process.h" #include "base/process_util.h" #include "base/stringprintf.h" diff --git a/chrome/test/chromedriver/commands_unittest.cc b/chrome/test/chromedriver/commands_unittest.cc index 08b3393..8baa18a 100644 --- a/chrome/test/chromedriver/commands_unittest.cc +++ b/chrome/test/chromedriver/commands_unittest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "base/values.h" diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc index 9660761..0fae72c 100644 --- a/chrome/test/gpu/gpu_pixel_browsertest.cc +++ b/chrome/test/gpu/gpu_pixel_browsertest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/chrome/test/logging/win/file_logger.cc b/chrome/test/logging/win/file_logger.cc index 56889a1..9702058 100644 --- a/chrome/test/logging/win/file_logger.cc +++ b/chrome/test/logging/win/file_logger.cc @@ -11,8 +11,8 @@ #include <ios> #include "base/debug/trace_event_win.h" +#include "base/files/file_path.h" #include "base/logging.h" -#include "base/file_path.h" #include "base/logging_win.h" #include "base/string16.h" #include "base/utf_string_conversions.h" diff --git a/chrome/test/logging/win/log_file_reader.cc b/chrome/test/logging/win/log_file_reader.cc index 6259e1c..9fa8985 100644 --- a/chrome/test/logging/win/log_file_reader.cc +++ b/chrome/test/logging/win/log_file_reader.cc @@ -5,7 +5,7 @@ #include "chrome/test/logging/win/log_file_reader.h" #include "base/debug/trace_event_win.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/logging_win.h" #include "base/synchronization/lock.h" diff --git a/chrome/test/logging/win/test_log_collector.cc b/chrome/test/logging/win/test_log_collector.cc index 6350406..0bb1f24 100644 --- a/chrome/test/logging/win/test_log_collector.cc +++ b/chrome/test/logging/win/test_log_collector.cc @@ -11,8 +11,8 @@ #include "base/command_line.h" #include "base/compiler_specific.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/lazy_instance.h" #include "base/logging.h" diff --git a/chrome/test/mini_installer_test/installer_path_provider.h b/chrome/test/mini_installer_test/installer_path_provider.h index 6a2f411..98e1b77 100644 --- a/chrome/test/mini_installer_test/installer_path_provider.h +++ b/chrome/test/mini_installer_test/installer_path_provider.h @@ -6,7 +6,7 @@ #define CHROME_TEST_MINI_INSTALLER_TEST_INSTALLER_PATH_PROVIDER_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" namespace installer_test { diff --git a/chrome/test/mini_installer_test/installer_test_util.h b/chrome/test/mini_installer_test/installer_test_util.h index 1be3e56..bda2617 100644 --- a/chrome/test/mini_installer_test/installer_test_util.h +++ b/chrome/test/mini_installer_test/installer_test_util.h @@ -8,7 +8,7 @@ #include <vector> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/installer/util/installation_validator.h" #include "chrome/test/mini_installer_test/switch_builder.h" diff --git a/chrome/test/mini_installer_test/test.cc b/chrome/test/mini_installer_test/test.cc index eda0b0e..5d5fb4e 100644 --- a/chrome/test/mini_installer_test/test.cc +++ b/chrome/test/mini_installer_test/test.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/process_util.h" #include "base/string_util.h" @@ -13,8 +13,8 @@ #include "chrome/installer/util/installation_validator.h" #include "chrome/installer/util/util_constants.h" #include "chrome/test/mini_installer_test/installer_path_provider.h" -#include "chrome/test/mini_installer_test/mini_installer_test_constants.h" #include "chrome/test/mini_installer_test/installer_test_util.h" +#include "chrome/test/mini_installer_test/mini_installer_test_constants.h" #include "chrome/test/mini_installer_test/switch_builder.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/test/nacl/nacl_browsertest_util.h b/chrome/test/nacl/nacl_browsertest_util.h index 972e86b..104b466 100644 --- a/chrome/test/nacl/nacl_browsertest_util.h +++ b/chrome/test/nacl/nacl_browsertest_util.h @@ -5,7 +5,7 @@ #ifndef CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ #define CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/javascript_test_observer.h" diff --git a/chrome/test/perf/dom_checker_uitest.cc b/chrome/test/perf/dom_checker_uitest.cc index aca6b4b..f4db35a 100644 --- a/chrome/test/perf/dom_checker_uitest.cc +++ b/chrome/test/perf/dom_checker_uitest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_string_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/test/perf/indexeddb_uitest.cc b/chrome/test/perf/indexeddb_uitest.cc index 66ed7e4..787f2bf1 100644 --- a/chrome/test/perf/indexeddb_uitest.cc +++ b/chrome/test/perf/indexeddb_uitest.cc @@ -2,12 +2,12 @@ // 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/path_service.h" #include "base/test/test_timeouts.h" #include "base/utf_string_conversions.h" -#include "chrome/common/chrome_paths.h" #include "chrome/common/automation_constants.h" +#include "chrome/common/chrome_paths.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/perf/perf_test.h" #include "chrome/test/ui/javascript_test_util.h" diff --git a/chrome/test/perf/memory_test.cc b/chrome/test/perf/memory_test.cc index 822d443..65fd0da5 100644 --- a/chrome/test/perf/memory_test.cc +++ b/chrome/test/perf/memory_test.cc @@ -4,8 +4,8 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/process_util.h" #include "base/string_util.h" diff --git a/chrome/test/perf/page_cycler_test.cc b/chrome/test/perf/page_cycler_test.cc index f72e247..1c07a89 100644 --- a/chrome/test/perf/page_cycler_test.cc +++ b/chrome/test/perf/page_cycler_test.cc @@ -4,8 +4,8 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/process_util.h" #include "base/string_piece.h" diff --git a/chrome/test/perf/rendering/throughput_tests.cc b/chrome/test/perf/rendering/throughput_tests.cc index b9e3086..e7c25aa 100644 --- a/chrome/test/perf/rendering/throughput_tests.cc +++ b/chrome/test/perf/rendering/throughput_tests.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/test/perf/tab_switching_test.cc b/chrome/test/perf/tab_switching_test.cc index c850567..45a0891 100644 --- a/chrome/test/perf/tab_switching_test.cc +++ b/chrome/test/perf/tab_switching_test.cc @@ -4,8 +4,8 @@ #include "base/command_line.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/stringprintf.h" diff --git a/chrome/test/perf/url_fetch_test.cc b/chrome/test/perf/url_fetch_test.cc index f4a05725..4a88f29 100644 --- a/chrome/test/perf/url_fetch_test.cc +++ b/chrome/test/perf/url_fetch_test.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/chrome/test/reliability/automated_ui_tests.cc b/chrome/test/reliability/automated_ui_tests.cc index 2fcd1c7..2c371c4 100644 --- a/chrome/test/reliability/automated_ui_tests.cc +++ b/chrome/test/reliability/automated_ui_tests.cc @@ -8,9 +8,9 @@ #include "base/command_line.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" #include "base/file_version_info.h" +#include "base/files/file_path.h" #include "base/i18n/time_formatting.h" #include "base/logging.h" #include "base/path_service.h" diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc index 303ef3d..18d78e3 100644 --- a/chrome/test/reliability/page_load_test.cc +++ b/chrome/test/reliability/page_load_test.cc @@ -39,9 +39,9 @@ #include "base/command_line.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" #include "base/file_version_info.h" +#include "base/files/file_path.h" #include "base/i18n/time_formatting.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 60c78cd..c5010b0 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -16,8 +16,8 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/environment.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/json/json_file_value_serializer.h" #include "base/logging.h" diff --git a/chrome/test/webdriver/commands/chrome_commands.cc b/chrome/test/webdriver/commands/chrome_commands.cc index 1b470aa..f470f29 100644 --- a/chrome/test/webdriver/commands/chrome_commands.cc +++ b/chrome/test/webdriver/commands/chrome_commands.cc @@ -7,7 +7,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/stringprintf.h" #include "chrome/test/automation/value_conversion_util.h" #include "chrome/test/webdriver/commands/response.h" diff --git a/chrome/test/webdriver/commands/create_session.cc b/chrome/test/webdriver/commands/create_session.cc index 06a95c3..ef53ee7 100644 --- a/chrome/test/webdriver/commands/create_session.cc +++ b/chrome/test/webdriver/commands/create_session.cc @@ -7,7 +7,7 @@ #include <string> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/values.h" #include "chrome/test/webdriver/commands/response.h" diff --git a/chrome/test/webdriver/webdriver_automation.cc b/chrome/test/webdriver/webdriver_automation.cc index 67c0ced..f604d78 100644 --- a/chrome/test/webdriver/webdriver_automation.cc +++ b/chrome/test/webdriver/webdriver_automation.cc @@ -12,8 +12,8 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_writer.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" diff --git a/chrome/test/webdriver/webdriver_automation.h b/chrome/test/webdriver/webdriver_automation.h index 5ca1d16..4c3c646 100644 --- a/chrome/test/webdriver/webdriver_automation.h +++ b/chrome/test/webdriver/webdriver_automation.h @@ -10,7 +10,7 @@ #include <vector> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/common/automation_constants.h" diff --git a/chrome/test/webdriver/webdriver_capabilities_parser.h b/chrome/test/webdriver/webdriver_capabilities_parser.h index 583a759..518d3ee 100644 --- a/chrome/test/webdriver/webdriver_capabilities_parser.h +++ b/chrome/test/webdriver/webdriver_capabilities_parser.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "chrome/test/webdriver/webdriver_logging.h" diff --git a/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc b/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc index 884bddb..5ae36b3 100644 --- a/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc +++ b/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/base64.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/values.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/test/webdriver/webdriver_logging.cc b/chrome/test/webdriver/webdriver_logging.cc index 467205c..5a597bf 100644 --- a/chrome/test/webdriver/webdriver_logging.cc +++ b/chrome/test/webdriver/webdriver_logging.cc @@ -6,8 +6,8 @@ #include <cmath> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/chrome/test/webdriver/webdriver_logging.h b/chrome/test/webdriver/webdriver_logging.h index ad39ab7..f257e87 100644 --- a/chrome/test/webdriver/webdriver_logging.h +++ b/chrome/test/webdriver/webdriver_logging.h @@ -9,8 +9,8 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/synchronization/lock.h" #include "base/values.h" diff --git a/chrome/test/webdriver/webdriver_server.cc b/chrome/test/webdriver/webdriver_server.cc index c25f7fe..cc4339f 100644 --- a/chrome/test/webdriver/webdriver_server.cc +++ b/chrome/test/webdriver/webdriver_server.cc @@ -15,8 +15,8 @@ #include "base/at_exit.h" #include "base/base_paths.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/string_split.h" diff --git a/chrome/test/webdriver/webdriver_session.cc b/chrome/test/webdriver/webdriver_session.cc index 164d506..9d50dde 100644 --- a/chrome/test/webdriver/webdriver_session.cc +++ b/chrome/test/webdriver/webdriver_session.cc @@ -10,8 +10,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/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/test/webdriver/webdriver_session.h b/chrome/test/webdriver/webdriver_session.h index 9f02c4a..9791cec 100644 --- a/chrome/test/webdriver/webdriver_session.h +++ b/chrome/test/webdriver/webdriver_session.h @@ -10,7 +10,7 @@ #include <vector> #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" diff --git a/chrome/test/webdriver/webdriver_session_manager.h b/chrome/test/webdriver/webdriver_session_manager.h index 60666dd..bedf0a6 100644 --- a/chrome/test/webdriver/webdriver_session_manager.h +++ b/chrome/test/webdriver/webdriver_session_manager.h @@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/singleton.h" #include "base/synchronization/lock.h" diff --git a/chrome/test/webdriver/webdriver_util_mac.mm b/chrome/test/webdriver/webdriver_util_mac.mm index a4050fe..e898996 100644 --- a/chrome/test/webdriver/webdriver_util_mac.mm +++ b/chrome/test/webdriver/webdriver_util_mac.mm @@ -6,7 +6,7 @@ #import <Foundation/Foundation.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/foundation_util.h" namespace webdriver { diff --git a/chrome/test/webdriver/webdriver_util_unittest.cc b/chrome/test/webdriver/webdriver_util_unittest.cc index ee1f15f..a888b01 100644 --- a/chrome/test/webdriver/webdriver_util_unittest.cc +++ b/chrome/test/webdriver/webdriver_util_unittest.cc @@ -6,8 +6,8 @@ #include <string> #include "base/base64.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 "chrome/test/webdriver/webdriver_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/tools/convert_dict/convert_dict.cc b/chrome/tools/convert_dict/convert_dict.cc index 94bfad8..a53784a 100644 --- a/chrome/tools/convert_dict/convert_dict.cc +++ b/chrome/tools/convert_dict/convert_dict.cc @@ -14,16 +14,16 @@ #include <stdio.h> #include "base/at_exit.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/i18n/icu_util.h" #include "base/logging.h" #include "base/process_util.h" #include "base/string_util.h" -#include "third_party/hunspell/google/bdict_reader.h" -#include "third_party/hunspell/google/bdict_writer.h" #include "chrome/tools/convert_dict/aff_reader.h" #include "chrome/tools/convert_dict/dic_reader.h" +#include "third_party/hunspell/google/bdict_reader.h" +#include "third_party/hunspell/google/bdict_writer.h" namespace { diff --git a/chrome/tools/crash_service/crash_service.h b/chrome/tools/crash_service/crash_service.h index 0c6dedf..1c9921b 100644 --- a/chrome/tools/crash_service/crash_service.h +++ b/chrome/tools/crash_service/crash_service.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/synchronization/lock.h" namespace google_breakpad { diff --git a/chrome/tools/mac_helpers/infoplist_strings_util.mm b/chrome/tools/mac_helpers/infoplist_strings_util.mm index abfcfde..b663bc8 100644 --- a/chrome/tools/mac_helpers/infoplist_strings_util.mm +++ b/chrome/tools/mac_helpers/infoplist_strings_util.mm @@ -11,8 +11,8 @@ #include <stdio.h> #include <unistd.h> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "base/memory/scoped_ptr.h" #include "base/string_piece.h" diff --git a/chrome/tools/perf/flush_cache/flush_cache.cc b/chrome/tools/perf/flush_cache/flush_cache.cc index 8436db0..9229952 100644 --- a/chrome/tools/perf/flush_cache/flush_cache.cc +++ b/chrome/tools/perf/flush_cache/flush_cache.cc @@ -5,9 +5,9 @@ // This little program attempts to flush the system cache for some files. // It's useful for testing Chrome with a cold database. -#include "base/file_path.h" -#include "base/string_piece.h" +#include "base/files/file_path.h" #include "base/process_util.h" +#include "base/string_piece.h" #include "base/sys_string_conversions.h" #include "base/test/test_file_util.h" diff --git a/chrome/tools/profiles/generate_profile.cc b/chrome/tools/profiles/generate_profile.cc index 71eb21e..fbd761e 100644 --- a/chrome/tools/profiles/generate_profile.cc +++ b/chrome/tools/profiles/generate_profile.cc @@ -9,8 +9,8 @@ #include "base/at_exit.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/i18n/icu_util.h" #include "base/logging.h" #include "base/message_loop.h" diff --git a/chrome/tools/safe_browsing/sb_sigutil.cc b/chrome/tools/safe_browsing/sb_sigutil.cc index 07da752..4a6d9db 100644 --- a/chrome/tools/safe_browsing/sb_sigutil.cc +++ b/chrome/tools/safe_browsing/sb_sigutil.cc @@ -11,8 +11,8 @@ #include <string> #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "chrome/browser/safe_browsing/signature_util.h" diff --git a/chrome_frame/bho.cc b/chrome_frame/bho.cc index b063034..f3e32e0 100644 --- a/chrome_frame/bho.cc +++ b/chrome_frame/bho.cc @@ -6,7 +6,7 @@ #include <shlguid.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/string_util.h" diff --git a/chrome_frame/chrome_frame_delegate.h b/chrome_frame/chrome_frame_delegate.h index 828e8f7..d880d59 100644 --- a/chrome_frame/chrome_frame_delegate.h +++ b/chrome_frame/chrome_frame_delegate.h @@ -12,7 +12,7 @@ #include <vector> #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/pending_task.h" #include "base/synchronization/lock.h" diff --git a/chrome_frame/chrome_launcher_unittest.cc b/chrome_frame/chrome_launcher_unittest.cc index 0fa88a7..b1022db 100644 --- a/chrome_frame/chrome_launcher_unittest.cc +++ b/chrome_frame/chrome_launcher_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/common/chrome_switches.h" #include "chrome_frame/chrome_launcher.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome_frame/crash_reporting/minidump_test.cc b/chrome_frame/crash_reporting/minidump_test.cc index 00edf11..e9766ab 100644 --- a/chrome_frame/crash_reporting/minidump_test.cc +++ b/chrome_frame/crash_reporting/minidump_test.cc @@ -3,14 +3,14 @@ // found in the LICENSE file. #include <windows.h> -#include <objbase.h> #include <dbghelp.h> +#include <objbase.h> #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" #include "base/file_version_info.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/win/scoped_handle.h" #include "gtest/gtest.h" diff --git a/chrome_frame/dll_redirector.cc b/chrome_frame/dll_redirector.cc index f5b6b4b..5c9943d 100644 --- a/chrome_frame/dll_redirector.cc +++ b/chrome_frame/dll_redirector.cc @@ -9,8 +9,8 @@ #include <atlsecurity.h> #include <sddl.h> -#include "base/file_path.h" #include "base/file_version_info.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/shared_memory.h" diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc index a1d1bcd..97026aa 100644 --- a/chrome_frame/simple_resource_loader.cc +++ b/chrome_frame/simple_resource_loader.cc @@ -9,11 +9,11 @@ #include <algorithm> #include "base/base_paths.h" -#include "base/file_path.h" #include "base/file_util.h" -#include "base/path_service.h" +#include "base/files/file_path.h" #include "base/i18n/rtl.h" #include "base/memory/singleton.h" +#include "base/path_service.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/win/i18n.h" diff --git a/chrome_frame/simple_resource_loader.h b/chrome_frame/simple_resource_loader.h index 9c31887..66b22bb 100644 --- a/chrome_frame/simple_resource_loader.h +++ b/chrome_frame/simple_resource_loader.h @@ -14,7 +14,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/singleton.h" diff --git a/chrome_frame/test/chrome_frame_automation_mock.h b/chrome_frame/test/chrome_frame_automation_mock.h index 8399d53..a550d5d 100644 --- a/chrome_frame/test/chrome_frame_automation_mock.h +++ b/chrome_frame/test/chrome_frame_automation_mock.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc index ac6afe6..ac52ea7 100644 --- a/chrome_frame/test/chrome_frame_test_utils.cc +++ b/chrome_frame/test/chrome_frame_test_utils.cc @@ -12,9 +12,9 @@ #include <winsock2.h> #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" #include "base/file_version_info.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/process.h" diff --git a/chrome_frame/test/chrome_frame_test_utils.h b/chrome_frame/test/chrome_frame_test_utils.h index 59b00ef..bb3480df 100644 --- a/chrome_frame/test/chrome_frame_test_utils.h +++ b/chrome_frame/test/chrome_frame_test_utils.h @@ -15,14 +15,14 @@ #include "base/basictypes.h" #include "base/cancelable_callback.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/run_loop.h" #include "base/process_util.h" -#include "base/time.h" +#include "base/run_loop.h" #include "base/test/test_reg_util_win.h" #include "base/time.h" +#include "base/time.h" #include "base/win/registry.h" #include "base/win/scoped_comptr.h" #include "chrome/test/base/ui_test_utils.h" diff --git a/chrome_frame/test/chrome_frame_ui_test_utils.h b/chrome_frame/test/chrome_frame_ui_test_utils.h index 7f98a79..2fee769 100644 --- a/chrome_frame/test/chrome_frame_ui_test_utils.h +++ b/chrome_frame/test/chrome_frame_ui_test_utils.h @@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/win/scoped_comptr.h" #include "base/win/scoped_variant.h" diff --git a/chrome_frame/test/dll_redirector_loading_test.cc b/chrome_frame/test/dll_redirector_loading_test.cc index 7182559..3da41cd 100644 --- a/chrome_frame/test/dll_redirector_loading_test.cc +++ b/chrome_frame/test/dll_redirector_loading_test.cc @@ -6,9 +6,9 @@ // generates a new version of CF from the one already in the build folder and // then loads them both into the current process to verify the handoff. -#include "base/file_path.h" #include "base/file_util.h" #include "base/file_version_info.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/scoped_native_library.h" diff --git a/chrome_frame/test/mock_ie_event_sink_test.h b/chrome_frame/test/mock_ie_event_sink_test.h index fcc7f2e..2d99cb2 100644 --- a/chrome_frame/test/mock_ie_event_sink_test.h +++ b/chrome_frame/test/mock_ie_event_sink_test.h @@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_number_conversions.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" diff --git a/chrome_frame/test/net/fake_external_tab.h b/chrome_frame/test/net/fake_external_tab.h index cb4337b..1c1e9f4 100644 --- a/chrome_frame/test/net/fake_external_tab.h +++ b/chrome_frame/test/net/fake_external_tab.h @@ -8,7 +8,7 @@ #include <string> #include "base/cancelable_callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/process.h" #include "base/win/scoped_handle.h" diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc index 90d2fbd..4fa629f 100644 --- a/chrome_frame/test/perf/chrome_frame_perftest.cc +++ b/chrome_frame/test/perf/chrome_frame_perftest.cc @@ -5,13 +5,14 @@ #include <atlwin.h> #include <atlhost.h> + #include <map> -#include <vector> #include <string> +#include <vector> #include "base/debug/trace_event_win.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/process_util.h" diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index f281d20..4d67392 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/chrome_frame/test/reliability/page_load_test.cc @@ -23,9 +23,9 @@ #include <ostream> #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" #include "base/file_version_info.h" +#include "base/files/file_path.h" #include "base/i18n/time_formatting.h" #include "base/path_service.h" #include "base/prefs/json_pref_store.h" diff --git a/chrome_frame/test/simple_resource_loader_test.cc b/chrome_frame/test/simple_resource_loader_test.cc index d9f60cc8..37070e3 100644 --- a/chrome_frame/test/simple_resource_loader_test.cc +++ b/chrome_frame/test/simple_resource_loader_test.cc @@ -4,7 +4,7 @@ #include "chrome_frame/simple_resource_loader.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/win/windows_version.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/resource/data_pack.h" diff --git a/chrome_frame/test/test_scrubber.cc b/chrome_frame/test/test_scrubber.cc index a927d70..ac1a0d2 100644 --- a/chrome_frame/test/test_scrubber.cc +++ b/chrome_frame/test/test_scrubber.cc @@ -11,8 +11,8 @@ #include <windows.h> #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/process_util.h" diff --git a/chrome_frame/test/util_unittests.cc b/chrome_frame/test/util_unittests.cc index f952dcf5..d4dd42f 100644 --- a/chrome_frame/test/util_unittests.cc +++ b/chrome_frame/test/util_unittests.cc @@ -2,19 +2,19 @@ // 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/file_version_info.h" #include "base/file_version_info_win.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/win/registry.h" #include "chrome_frame/navigation_constraints.h" -#include "chrome_frame/test/chrome_frame_test_utils.h" #include "chrome_frame/registry_list_preferences_holder.h" +#include "chrome_frame/test/chrome_frame_test_utils.h" #include "chrome_frame/utils.h" -#include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" using base::win::RegKey; diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc index fd1ec78..7e516a8 100644 --- a/chrome_frame/test_utils.cc +++ b/chrome_frame/test_utils.cc @@ -12,8 +12,8 @@ #include <algorithm> #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/process_util.h" diff --git a/chromeos/chromeos_test_utils.cc b/chromeos/chromeos_test_utils.cc index 90ee92a..eee9af6 100644 --- a/chromeos/chromeos_test_utils.cc +++ b/chromeos/chromeos_test_utils.cc @@ -4,8 +4,8 @@ #include "chromeos/chromeos_test_utils.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" namespace chromeos { diff --git a/chromeos/network/onc/onc_test_utils.cc b/chromeos/network/onc/onc_test_utils.cc index e15baf7..3e854a3 100644 --- a/chromeos/network/onc/onc_test_utils.cc +++ b/chromeos/network/onc/onc_test_utils.cc @@ -4,8 +4,8 @@ #include "chromeos/network/onc/onc_test_utils.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/logging.h" #include "base/path_service.h" diff --git a/chromeos/tools/onc_validator/onc_validator.cc b/chromeos/tools/onc_validator/onc_validator.cc index 49c31ee..65b7c42 100644 --- a/chromeos/tools/onc_validator/onc_validator.cc +++ b/chromeos/tools/onc_validator/onc_validator.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/logging.h" #include "base/values.h" diff --git a/cloud_print/service/win/chrome_launcher.h b/cloud_print/service/win/chrome_launcher.h index 322e21f..cf53102 100644 --- a/cloud_print/service/win/chrome_launcher.h +++ b/cloud_print/service/win/chrome_launcher.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/threading/simple_thread.h" diff --git a/cloud_print/service/win/cloud_print_service.cc b/cloud_print/service/win/cloud_print_service.cc index b4a2ae6..b22c603 100644 --- a/cloud_print/service/win/cloud_print_service.cc +++ b/cloud_print/service/win/cloud_print_service.cc @@ -12,8 +12,8 @@ #include "base/at_exit.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/guid.h" #include "base/path_service.h" #include "base/string_util.h" diff --git a/components/visitedlink/browser/visitedlink_master.h b/components/visitedlink/browser/visitedlink_master.h index aea4ccb..931a9ad 100644 --- a/components/visitedlink/browser/visitedlink_master.h +++ b/components/visitedlink/browser/visitedlink_master.h @@ -13,7 +13,7 @@ #include "base/callback.h" #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/shared_memory.h" #include "base/threading/sequenced_worker_pool.h" diff --git a/components/visitedlink/test/visitedlink_perftest.cc b/components/visitedlink/test/visitedlink_perftest.cc index a059eb7..c9577f1 100644 --- a/components/visitedlink/test/visitedlink_perftest.cc +++ b/components/visitedlink/test/visitedlink_perftest.cc @@ -6,8 +6,8 @@ #include <string> #include <vector> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/perftimer.h" #include "base/shared_memory.h" #include "base/stringprintf.h" diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc index f9607c1..213f65e 100644 --- a/content/app/android/library_loader_hooks.cc +++ b/content/app/android/library_loader_hooks.cc @@ -5,22 +5,22 @@ #include "content/public/app/android_library_loader_hooks.h" #include "base/android/base_jni_registrar.h" -#include "base/android/jni_registrar.h" #include "base/android/jni_android.h" +#include "base/android/jni_registrar.h" #include "base/android/jni_string.h" #include "base/at_exit.h" #include "base/base_switches.h" #include "base/command_line.h" #include "base/debug/trace_event.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/string_util.h" #include "base/tracked_objects.h" #include "content/app/android/app_jni_registrar.h" #include "content/browser/android/browser_jni_registrar.h" -#include "content/common/android/common_jni_registrar.h" #include "content/common/android/command_line.h" +#include "content/common/android/common_jni_registrar.h" #include "content/public/common/content_switches.h" #include "content/public/common/result_codes.h" #include "jni/LibraryLoader_jni.h" diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index cfe320a..147b5a0 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -11,7 +11,7 @@ #include "base/command_line.h" #include "base/debug/debugger.h" #include "base/debug/trace_event.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/icu_util.h" #include "base/lazy_instance.h" #include "base/logging.h" @@ -20,9 +20,9 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/profiler/alternate_timer.h" +#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/string_number_conversions.h" #include "content/browser/browser_main.h" #include "content/common/set_process_title.h" #include "content/common/url_schemes.h" @@ -39,8 +39,8 @@ #include "ipc/ipc_switches.h" #include "media/base/media.h" #include "sandbox/win/src/sandbox_types.h" -#include "ui/base/ui_base_switches.h" #include "ui/base/ui_base_paths.h" +#include "ui/base/ui_base_switches.h" #include "ui/base/win/dpi.h" #include "webkit/user_agent/user_agent.h" @@ -59,10 +59,10 @@ #endif #if defined(OS_WIN) -#include <cstring> #include <atlbase.h> #include <atlapp.h> #include <malloc.h> +#include <cstring> #elif defined(OS_MACOSX) #include "base/mac/scoped_nsautorelease_pool.h" #if !defined(OS_IOS) diff --git a/content/browser/accessibility/browser_accessibility_state_impl_win.cc b/content/browser/accessibility/browser_accessibility_state_impl_win.cc index 77a6332..3290355 100644 --- a/content/browser/accessibility/browser_accessibility_state_impl_win.cc +++ b/content/browser/accessibility/browser_accessibility_state_impl_win.cc @@ -4,10 +4,10 @@ #include "content/browser/accessibility/browser_accessibility_state_impl.h" -#include <psapi.h> #include <windows.h> +#include <psapi.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/metrics/histogram.h" #include "base/string_util.h" diff --git a/content/browser/accessibility/dump_accessibility_tree_helper.h b/content/browser/accessibility/dump_accessibility_tree_helper.h index 9428237..ff5883b 100644 --- a/content/browser/accessibility/dump_accessibility_tree_helper.h +++ b/content/browser/accessibility/dump_accessibility_tree_helper.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "base/utf_string_conversions.h" #include "content/browser/accessibility/browser_accessibility.h" diff --git a/content/browser/accessibility/dump_accessibility_tree_helper_mac.mm b/content/browser/accessibility/dump_accessibility_tree_helper_mac.mm index 895c7e7..669956b 100644 --- a/content/browser/accessibility/dump_accessibility_tree_helper_mac.mm +++ b/content/browser/accessibility/dump_accessibility_tree_helper_mac.mm @@ -6,7 +6,7 @@ #import <Cocoa/Cocoa.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "content/browser/accessibility/browser_accessibility_cocoa.h" #include "content/browser/accessibility/browser_accessibility_mac.h" diff --git a/content/browser/accessibility/dump_accessibility_tree_helper_win.cc b/content/browser/accessibility/dump_accessibility_tree_helper_win.cc index 229bf35..6dcbcc9 100644 --- a/content/browser/accessibility/dump_accessibility_tree_helper_win.cc +++ b/content/browser/accessibility/dump_accessibility_tree_helper_win.cc @@ -8,7 +8,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" diff --git a/content/browser/appcache/chrome_appcache_service.cc b/content/browser/appcache/chrome_appcache_service.cc index b3bfd0f..97a821d 100644 --- a/content/browser/appcache/chrome_appcache_service.cc +++ b/content/browser/appcache/chrome_appcache_service.cc @@ -4,8 +4,8 @@ #include "content/browser/appcache/chrome_appcache_service.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/resource_context.h" diff --git a/content/browser/browser_child_process_host_impl.cc b/content/browser/browser_child_process_host_impl.cc index cd6167a..f752330 100644 --- a/content/browser/browser_child_process_host_impl.cc +++ b/content/browser/browser_child_process_host_impl.cc @@ -7,7 +7,7 @@ #include "base/base_switches.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/metrics/histogram.h" @@ -21,8 +21,8 @@ #include "content/browser/tracing/trace_message_filter.h" #include "content/common/child_process_host_impl.h" #include "content/common/plugin_messages.h" -#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_child_process_host_delegate.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_data.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/notification_service.h" diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc index a8e68cf..1630fdd 100644 --- a/content/browser/child_process_launcher.cc +++ b/content/browser/child_process_launcher.cc @@ -21,7 +21,7 @@ #include "content/public/common/result_codes.h" #if defined(OS_WIN) -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/common/sandbox_policy.h" #include "content/public/common/sandbox_init.h" #elif defined(OS_MACOSX) diff --git a/content/browser/child_process_security_policy_browsertest.cc b/content/browser/child_process_security_policy_browsertest.cc index 2cd2f51..e475c02 100644 --- a/content/browser/child_process_security_policy_browsertest.cc +++ b/content/browser/child_process_security_policy_browsertest.cc @@ -5,7 +5,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process_util.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/browser/web_contents/web_contents_impl.h" diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc index e705fa6..45694fa 100644 --- a/content/browser/child_process_security_policy_impl.cc +++ b/content/browser/child_process_security_policy_impl.cc @@ -5,7 +5,7 @@ #include "content/browser/child_process_security_policy_impl.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/platform_file.h" diff --git a/content/browser/child_process_security_policy_unittest.cc b/content/browser/child_process_security_policy_unittest.cc index d9a4446..a2eed34 100644 --- a/content/browser/child_process_security_policy_unittest.cc +++ b/content/browser/child_process_security_policy_unittest.cc @@ -6,7 +6,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/platform_file.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/public/common/url_constants.h" diff --git a/content/browser/device_orientation/device_orientation_browsertest.cc b/content/browser/device_orientation/device_orientation_browsertest.cc index 5bceb69..7edfbc2 100644 --- a/content/browser/device_orientation/device_orientation_browsertest.cc +++ b/content/browser/device_orientation/device_orientation_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "content/browser/device_orientation/device_data.h" diff --git a/content/browser/devtools/renderer_overrides_handler.cc b/content/browser/devtools/renderer_overrides_handler.cc index fbe2f5b..96680c1 100644 --- a/content/browser/devtools/renderer_overrides_handler.cc +++ b/content/browser/devtools/renderer_overrides_handler.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/stringprintf.h" #include "base/values.h" #include "content/browser/child_process_security_policy_impl.h" diff --git a/content/browser/dom_storage/dom_storage_context_impl.cc b/content/browser/dom_storage/dom_storage_context_impl.cc index 381d67da..4c00467 100644 --- a/content/browser/dom_storage/dom_storage_context_impl.cc +++ b/content/browser/dom_storage/dom_storage_context_impl.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop_proxy.h" #include "content/browser/dom_storage/session_storage_namespace_impl.h" #include "content/public/browser/browser_thread.h" diff --git a/content/browser/download/base_file.h b/content/browser/download/base_file.h index 9f6d4343..faa73c8 100644 --- a/content/browser/download/base_file.h +++ b/content/browser/download/base_file.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" diff --git a/content/browser/download/download_browsertest.cc b/content/browser/download/download_browsertest.cc index bfae37f..9e8921c 100644 --- a/content/browser/download/download_browsertest.cc +++ b/content/browser/download/download_browsertest.cc @@ -6,8 +6,8 @@ // in a pure content context. Over time tests should be migrated here. #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 "content/browser/download/byte_stream.h" #include "content/browser/download/download_file_factory.h" diff --git a/content/browser/download/download_create_info.h b/content/browser/download/download_create_info.h index b8e1afa..9f88da1 100644 --- a/content/browser/download/download_create_info.h +++ b/content/browser/download/download_create_info.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/time.h" #include "content/browser/download/download_file.h" #include "content/browser/download/download_request_handle.h" diff --git a/content/browser/download/download_file.h b/content/browser/download/download_file.h index d52f190..e135efc 100644 --- a/content/browser/download/download_file.h +++ b/content/browser/download/download_file.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/common/content_export.h" #include "content/public/browser/download_interrupt_reasons.h" diff --git a/content/browser/download/download_file_factory.h b/content/browser/download/download_file_factory.h index 7ff9468..dc260ca 100644 --- a/content/browser/download/download_file_factory.h +++ b/content/browser/download/download_file_factory.h @@ -5,9 +5,9 @@ #ifndef CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_FILE_FACTORY_H_ #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_FILE_FACTORY_H_ -#include "base/file_path.h" -#include "base/memory/scoped_ptr.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" #include "content/common/content_export.h" #include "googleurl/src/gurl.h" diff --git a/content/browser/download/download_item_impl.h b/content/browser/download/download_item_impl.h index ad3ef6d..42cd190 100644 --- a/content/browser/download/download_item_impl.h +++ b/content/browser/download/download_item_impl.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" diff --git a/content/browser/download/download_item_impl_delegate.h b/content/browser/download/download_item_impl_delegate.h index 63b4717..33f8422 100644 --- a/content/browser/download/download_item_impl_delegate.h +++ b/content/browser/download/download_item_impl_delegate.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_IMPL_DELEGATE_H_ #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/common/content_export.h" #include "content/public/browser/download_danger_type.h" #include "content/public/browser/download_item.h" diff --git a/content/browser/download/download_net_log_parameters.cc b/content/browser/download/download_net_log_parameters.cc index a987864..2bbf55f 100644 --- a/content/browser/download/download_net_log_parameters.cc +++ b/content/browser/download/download_net_log_parameters.cc @@ -5,7 +5,7 @@ #include "content/browser/download/download_net_log_parameters.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/string_number_conversions.h" #include "base/values.h" diff --git a/content/browser/download/drag_download_file.h b/content/browser/download/drag_download_file.h index 32c8afe..e97f585 100644 --- a/content/browser/download/drag_download_file.h +++ b/content/browser/download/drag_download_file.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_DOWNLOAD_DRAG_DOWNLOAD_FILE_H_ #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" diff --git a/content/browser/download/drag_download_file_browsertest.cc b/content/browser/download/drag_download_file_browsertest.cc index 83daf02..e35cbfb 100644 --- a/content/browser/download/drag_download_file_browsertest.cc +++ b/content/browser/download/drag_download_file_browsertest.cc @@ -2,8 +2,8 @@ // 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/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "content/browser/download/download_file_factory.h" #include "content/browser/download/download_file_impl.h" diff --git a/content/browser/download/drag_download_util.cc b/content/browser/download/drag_download_util.cc index d275702..ea1c897 100644 --- a/content/browser/download/drag_download_util.cc +++ b/content/browser/download/drag_download_util.cc @@ -7,8 +7,8 @@ #include <string> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/string_number_conversions.h" #include "base/string_util.h" diff --git a/content/browser/download/file_metadata_linux.cc b/content/browser/download/file_metadata_linux.cc index 9c9318d..73f66d7 100644 --- a/content/browser/download/file_metadata_linux.cc +++ b/content/browser/download/file_metadata_linux.cc @@ -7,8 +7,8 @@ #include <sys/types.h> #include <sys/xattr.h> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "googleurl/src/gurl.h" diff --git a/content/browser/download/file_metadata_mac.mm b/content/browser/download/file_metadata_mac.mm index 0a45cdb..548229c 100644 --- a/content/browser/download/file_metadata_mac.mm +++ b/content/browser/download/file_metadata_mac.mm @@ -7,7 +7,7 @@ #include <ApplicationServices/ApplicationServices.h> #include <Foundation/Foundation.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/mac/mac_logging.h" #include "base/mac/mac_util.h" diff --git a/content/browser/download/file_metadata_unittest_linux.cc b/content/browser/download/file_metadata_unittest_linux.cc index c1aa415..504f130 100644 --- a/content/browser/download/file_metadata_unittest_linux.cc +++ b/content/browser/download/file_metadata_unittest_linux.cc @@ -10,8 +10,8 @@ #include <sstream> #include <string> -#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/logging.h" #include "base/strings/string_split.h" diff --git a/content/browser/download/mhtml_generation_browsertest.cc b/content/browser/download/mhtml_generation_browsertest.cc index 534a530..6944a6c 100644 --- a/content/browser/download/mhtml_generation_browsertest.cc +++ b/content/browser/download/mhtml_generation_browsertest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/bind.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/run_loop.h" #include "content/public/browser/web_contents.h" diff --git a/content/browser/download/mock_download_file.h b/content/browser/download/mock_download_file.h index 39d4804..8a80477 100644 --- a/content/browser/download/mock_download_file.h +++ b/content/browser/download/mock_download_file.h @@ -5,10 +5,10 @@ #ifndef CONTENT_BROWSER_DOWNLOAD_MOCK_DOWNLOAD_FILE_H_ #define CONTENT_BROWSER_DOWNLOAD_MOCK_DOWNLOAD_FILE_H_ -#include <string> #include <map> +#include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "content/browser/download/download_file.h" #include "content/public/browser/download_id.h" diff --git a/content/browser/download/save_file.h b/content/browser/download/save_file.h index 0b2ec06..bafa253 100644 --- a/content/browser/download/save_file.h +++ b/content/browser/download/save_file.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_DOWNLOAD_SAVE_FILE_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "content/browser/download/base_file.h" #include "content/browser/download/save_types.h" diff --git a/content/browser/download/save_item.h b/content/browser/download/save_item.h index 3a1d8df..106126f 100644 --- a/content/browser/download/save_item.h +++ b/content/browser/download/save_item.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_DOWNLOAD_SAVE_ITEM_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/browser/download/save_types.h" #include "content/public/common/referrer.h" #include "googleurl/src/gurl.h" diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc index af3ac78..bff3a1a 100644 --- a/content/browser/download/save_package.cc +++ b/content/browser/download/save_package.cc @@ -7,8 +7,8 @@ #include <algorithm> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/i18n/file_util_icu.h" #include "base/logging.h" #include "base/message_loop.h" diff --git a/content/browser/download/save_package.h b/content/browser/download/save_package.h index 4d17368..222a011 100644 --- a/content/browser/download/save_package.h +++ b/content/browser/download/save_package.h @@ -11,7 +11,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/hash_tables.h" #include "base/memory/ref_counted.h" diff --git a/content/browser/download/save_package_unittest.cc b/content/browser/download/save_package_unittest.cc index da4ccc8..e925aca 100644 --- a/content/browser/download/save_package_unittest.cc +++ b/content/browser/download/save_package_unittest.cc @@ -4,7 +4,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/string_util.h" diff --git a/content/browser/download/save_types.h b/content/browser/download/save_types.h index ab3fba9..5f60e1e 100644 --- a/content/browser/download/save_types.h +++ b/content/browser/download/save_types.h @@ -10,7 +10,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "googleurl/src/gurl.h" namespace content { diff --git a/content/browser/fileapi/browser_file_system_helper.cc b/content/browser/fileapi/browser_file_system_helper.cc index 21e7b7d..e7b22c5 100644 --- a/content/browser/fileapi/browser_file_system_helper.cc +++ b/content/browser/fileapi/browser_file_system_helper.cc @@ -4,11 +4,11 @@ #include "content/browser/fileapi/browser_file_system_helper.h" -#include <vector> #include <string> +#include <vector> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/threading/sequenced_worker_pool.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/content_switches.h" diff --git a/content/browser/fileapi/file_system_browsertest.cc b/content/browser/fileapi/file_system_browsertest.cc index 7a226af..74633a0 100644 --- a/content/browser/fileapi/file_system_browsertest.cc +++ b/content/browser/fileapi/file_system_browsertest.cc @@ -4,7 +4,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/test/thread_test_helper.h" #include "content/browser/web_contents/web_contents_impl.h" diff --git a/content/browser/fileapi/fileapi_message_filter.cc b/content/browser/fileapi/fileapi_message_filter.cc index 1d5c4b7..8db59cb 100644 --- a/content/browser/fileapi/fileapi_message_filter.cc +++ b/content/browser/fileapi/fileapi_message_filter.cc @@ -8,7 +8,7 @@ #include <vector> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" #include "base/threading/thread.h" diff --git a/content/browser/geolocation/win7_location_api_win.cc b/content/browser/geolocation/win7_location_api_win.cc index 093a2aa..26f81b3 100644 --- a/content/browser/geolocation/win7_location_api_win.cc +++ b/content/browser/geolocation/win7_location_api_win.cc @@ -6,7 +6,7 @@ #include "base/base_paths_win.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/content/browser/gpu/gpu_blacklist_unittest.cc b/content/browser/gpu/gpu_blacklist_unittest.cc index 08a6cf2..a7e93bf 100644 --- a/content/browser/gpu/gpu_blacklist_unittest.cc +++ b/content/browser/gpu/gpu_blacklist_unittest.cc @@ -5,8 +5,8 @@ #include <vector> #include "base/base_paths.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "content/browser/gpu/gpu_blacklist.h" diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h index a0853e5..e41f191 100644 --- a/content/browser/gpu/gpu_data_manager_impl.h +++ b/content/browser/gpu/gpu_data_manager_impl.h @@ -10,7 +10,7 @@ #include <string> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" diff --git a/content/browser/gpu/gpu_pixel_browsertest.cc b/content/browser/gpu/gpu_pixel_browsertest.cc index 391c899..876bdb9 100644 --- a/content/browser/gpu/gpu_pixel_browsertest.cc +++ b/content/browser/gpu/gpu_pixel_browsertest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string_number_conversions.h" #include "base/string_util.h" diff --git a/content/browser/hyphenator/hyphenator_message_filter.h b/content/browser/hyphenator/hyphenator_message_filter.h index a3216cf..a5ed21c 100644 --- a/content/browser/hyphenator/hyphenator_message_filter.h +++ b/content/browser/hyphenator/hyphenator_message_filter.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_HYPHENATOR_HYPHENATOR_MESSAGE_FILTER_H_ #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/platform_file.h" #include "content/common/content_export.h" diff --git a/content/browser/hyphenator/hyphenator_message_filter_unittest.cc b/content/browser/hyphenator/hyphenator_message_filter_unittest.cc index 2516b31..385d56ee 100644 --- a/content/browser/hyphenator/hyphenator_message_filter_unittest.cc +++ b/content/browser/hyphenator/hyphenator_message_filter_unittest.cc @@ -5,7 +5,7 @@ #include "content/browser/hyphenator/hyphenator_message_filter.h" #include "base/base_paths.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string16.h" #include "base/utf_string_conversions.h" diff --git a/content/browser/in_process_webkit/indexed_db_browsertest.cc b/content/browser/in_process_webkit/indexed_db_browsertest.cc index 2dbe347..0c968aa 100644 --- a/content/browser/in_process_webkit/indexed_db_browsertest.cc +++ b/content/browser/in_process_webkit/indexed_db_browsertest.cc @@ -4,8 +4,8 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/process_util.h" diff --git a/content/browser/in_process_webkit/indexed_db_context_impl.h b/content/browser/in_process_webkit/indexed_db_context_impl.h index e8a2a7c0..284f41f 100644 --- a/content/browser/in_process_webkit/indexed_db_context_impl.h +++ b/content/browser/in_process_webkit/indexed_db_context_impl.h @@ -9,7 +9,7 @@ #include <set> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/indexed_db_context.h" diff --git a/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc b/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc index fc054fd..197bfc8 100644 --- a/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc +++ b/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc @@ -5,8 +5,8 @@ #include <map> #include "base/bind.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/message_loop_proxy.h" diff --git a/content/browser/loader/redirect_to_file_resource_handler.h b/content/browser/loader/redirect_to_file_resource_handler.h index 574738a..459b982 100644 --- a/content/browser/loader/redirect_to_file_resource_handler.h +++ b/content/browser/loader/redirect_to_file_resource_handler.h @@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_LOADER_REDIRECT_TO_FILE_RESOURCE_HANDLER_H_ #define CONTENT_BROWSER_LOADER_REDIRECT_TO_FILE_RESOURCE_HANDLER_H_ -#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/content/browser/loader/resource_dispatcher_host_unittest.cc b/content/browser/loader/resource_dispatcher_host_unittest.cc index f62b1a2..139b416 100644 --- a/content/browser/loader/resource_dispatcher_host_unittest.cc +++ b/content/browser/loader/resource_dispatcher_host_unittest.cc @@ -5,7 +5,7 @@ #include <vector> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_vector.h" #include "base/message_loop.h" #include "base/pickle.h" diff --git a/content/browser/mime_registry_message_filter.h b/content/browser/mime_registry_message_filter.h index 5dc8153..4a719a5 100644 --- a/content/browser/mime_registry_message_filter.h +++ b/content/browser/mime_registry_message_filter.h @@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_MIME_REGISTRY_MESSAGE_FILTER_H_ #define CONTENT_BROWSER_MIME_REGISTRY_MESSAGE_FILTER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/public/browser/browser_message_filter.h" namespace content { diff --git a/content/browser/pepper_flash_settings_helper_impl.cc b/content/browser/pepper_flash_settings_helper_impl.cc index bd99b1a..f51248c 100644 --- a/content/browser/pepper_flash_settings_helper_impl.cc +++ b/content/browser/pepper_flash_settings_helper_impl.cc @@ -4,7 +4,7 @@ #include "content/browser/pepper_flash_settings_helper_impl.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/browser/plugin_service_impl.h" #include "content/public/browser/browser_thread.h" #include "ipc/ipc_channel_handle.h" diff --git a/content/browser/plugin_loader_posix_unittest.cc b/content/browser/plugin_loader_posix_unittest.cc index 01b961a..6944384 100644 --- a/content/browser/plugin_loader_posix_unittest.cc +++ b/content/browser/plugin_loader_posix_unittest.cc @@ -6,7 +6,7 @@ #include "base/at_exit.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc index d63aca9..62be9db7 100644 --- a/content/browser/plugin_process_host.cc +++ b/content/browser/plugin_process_host.cc @@ -15,8 +15,8 @@ #include "base/base_switches.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc index 7f393af..e3dcdd1 100644 --- a/content/browser/plugin_service_impl.cc +++ b/content/browser/plugin_service_impl.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/path_service.h" diff --git a/content/browser/power_save_blocker_linux.cc b/content/browser/power_save_blocker_linux.cc index e6c7791..a0e3764 100644 --- a/content/browser/power_save_blocker_linux.cc +++ b/content/browser/power_save_blocker_linux.cc @@ -16,7 +16,7 @@ #include "base/callback.h" #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/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc index dfdf3df..a4dd416 100644 --- a/content/browser/ppapi_plugin_process_host.cc +++ b/content/browser/ppapi_plugin_process_host.cc @@ -8,7 +8,7 @@ #include "base/base_switches.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process_util.h" #include "base/utf_string_conversions.h" #include "content/browser/browser_child_process_host_impl.h" diff --git a/content/browser/ppapi_plugin_process_host.h b/content/browser/ppapi_plugin_process_host.h index 01a43c9..4acf9a2 100644 --- a/content/browser/ppapi_plugin_process_host.h +++ b/content/browser/ppapi_plugin_process_host.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#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/process.h" diff --git a/content/browser/renderer_host/file_utilities_message_filter.h b/content/browser/renderer_host/file_utilities_message_filter.h index 9faacef..1b5640a 100644 --- a/content/browser/renderer_host/file_utilities_message_filter.h +++ b/content/browser/renderer_host/file_utilities_message_filter.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_RENDERER_HOST_FILE_UTILITIES_MESSAGE_FILTER_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/public/browser/browser_message_filter.h" #include "ipc/ipc_platform_file.h" diff --git a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h index 9271805..626866b 100644 --- a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h +++ b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h" #include "content/common/content_export.h" #include "content/public/browser/browser_ppapi_host.h" diff --git a/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h b/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h index 7863680..057adc1 100644 --- a/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h +++ b/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_FILE_MESSAGE_FILTER_H_ #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/process.h" #include "ppapi/c/pp_instance.h" diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.cc b/content/browser/renderer_host/pepper/pepper_message_filter.cc index fb40d85..4654898 100644 --- a/content/browser/renderer_host/pepper/pepper_message_filter.cc +++ b/content/browser/renderer_host/pepper/pepper_message_filter.cc @@ -8,8 +8,8 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.h b/content/browser/renderer_host/pepper/pepper_message_filter.h index bc5a5c9..5956c75 100644 --- a/content/browser/renderer_host/pepper/pepper_message_filter.h +++ b/content/browser/renderer_host/pepper/pepper_message_filter.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/process.h" diff --git a/content/browser/renderer_host/render_message_filter.h b/content/browser/renderer_host/render_message_filter.h index 3a1bdd2..6f19c33 100644 --- a/content/browser/renderer_host/render_message_filter.h +++ b/content/browser/renderer_host/render_message_filter.h @@ -13,7 +13,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/linked_ptr.h" #include "base/sequenced_task_runner_helpers.h" #include "base/shared_memory.h" diff --git a/content/browser/safe_util_win.cc b/content/browser/safe_util_win.cc index f0d8dc5..700f4b3 100644 --- a/content/browser/safe_util_win.cc +++ b/content/browser/safe_util_win.cc @@ -7,7 +7,7 @@ #include "content/browser/safe_util_win.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/string_util.h" diff --git a/content/browser/speech/speech_recognition_browsertest.cc b/content/browser/speech/speech_recognition_browsertest.cc index b1810f3..b09641c 100644 --- a/content/browser/speech/speech_recognition_browsertest.cc +++ b/content/browser/speech/speech_recognition_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/string_number_conversions.h" diff --git a/content/browser/storage_partition_impl.h b/content/browser/storage_partition_impl.h index 6de28ed..90722e2 100644 --- a/content/browser/storage_partition_impl.h +++ b/content/browser/storage_partition_impl.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_STORAGE_PARTITION_IMPL_H_ #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "content/browser/appcache/chrome_appcache_service.h" #include "content/browser/dom_storage/dom_storage_context_impl.h" diff --git a/content/browser/storage_partition_impl_map.cc b/content/browser/storage_partition_impl_map.cc index 75c4898..dedb5a0 100644 --- a/content/browser/storage_partition_impl_map.cc +++ b/content/browser/storage_partition_impl_map.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" @@ -22,8 +22,8 @@ #include "content/browser/net/view_http_cache_job_factory.h" #include "content/browser/resource_context_impl.h" #include "content/browser/storage_partition_impl.h" -#include "content/browser/webui/url_data_manager_backend.h" #include "content/browser/tcmalloc_internals_request_job.h" +#include "content/browser/webui/url_data_manager_backend.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" @@ -31,8 +31,8 @@ #include "content/public/common/content_constants.h" #include "content/public/common/url_constants.h" #include "crypto/sha2.h" -#include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_context.h" +#include "net/url_request/url_request_context_getter.h" #include "webkit/appcache/view_appcache_internals_job.h" #include "webkit/blob/blob_data.h" #include "webkit/blob/blob_url_request_job_factory.h" diff --git a/content/browser/system_message_window_win_unittest.cc b/content/browser/system_message_window_win_unittest.cc index 0fa5109..38566b5 100644 --- a/content/browser/system_message_window_win_unittest.cc +++ b/content/browser/system_message_window_win_unittest.cc @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/system_monitor/system_monitor.h" #include "base/test/mock_devices_changed_observer.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/content/browser/web_contents/web_contents_drag_win.cc b/content/browser/web_contents/web_contents_drag_win.cc index 32dcb69..cb83dcd 100644 --- a/content/browser/web_contents/web_contents_drag_win.cc +++ b/content/browser/web_contents/web_contents_drag_win.cc @@ -9,8 +9,8 @@ #include <string> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/pickle.h" #include "base/threading/platform_thread.h" diff --git a/content/browser/web_contents/web_drag_dest_gtk.cc b/content/browser/web_contents/web_drag_dest_gtk.cc index 1d8e960..dcd89b0 100644 --- a/content/browser/web_contents/web_drag_dest_gtk.cc +++ b/content/browser/web_contents/web_drag_dest_gtk.cc @@ -7,7 +7,7 @@ #include <string> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "content/browser/renderer_host/render_view_host_impl.h" diff --git a/content/browser/web_contents/web_drag_source_gtk.h b/content/browser/web_contents/web_drag_source_gtk.h index 1926ca2..d95b40e 100644 --- a/content/browser/web_contents/web_drag_source_gtk.h +++ b/content/browser/web_contents/web_drag_source_gtk.h @@ -8,7 +8,7 @@ #include <gtk/gtk.h> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/string16.h" #include "content/common/content_export.h" diff --git a/content/browser/web_contents/web_drag_source_mac.h b/content/browser/web_contents/web_drag_source_mac.h index a6cabec..a8f1f00 100644 --- a/content/browser/web_contents/web_drag_source_mac.h +++ b/content/browser/web_contents/web_drag_source_mac.h @@ -4,7 +4,7 @@ #import <Cocoa/Cocoa.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/scoped_cftyperef.h" #include "base/memory/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" diff --git a/content/browser/web_contents/web_drag_source_mac.mm b/content/browser/web_contents/web_drag_source_mac.mm index f371dcb..83521f1 100644 --- a/content/browser/web_contents/web_drag_source_mac.mm +++ b/content/browser/web_contents/web_drag_source_mac.mm @@ -7,7 +7,7 @@ #include <sys/param.h> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/mac_util.h" #include "base/pickle.h" #include "base/string_util.h" diff --git a/content/browser/worker_host/test/worker_browsertest.cc b/content/browser/worker_host/test/worker_browsertest.cc index 73c4447..0c335b6 100644 --- a/content/browser/worker_host/test/worker_browsertest.cc +++ b/content/browser/worker_host/test/worker_browsertest.cc @@ -3,11 +3,11 @@ // found in the LICENSE file. #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/stringprintf.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/sys_info.h" #include "base/test/test_timeouts.h" #include "base/utf_string_conversions.h" diff --git a/content/browser/worker_host/worker_process_host.h b/content/browser/worker_host/worker_process_host.h index 6802189..147348d 100644 --- a/content/browser/worker_host/worker_process_host.h +++ b/content/browser/worker_host/worker_process_host.h @@ -10,11 +10,11 @@ #include <utility> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" -#include "content/common/content_export.h" #include "content/browser/worker_host/worker_document_set.h" #include "content/browser/worker_host/worker_storage_partition.h" +#include "content/common/content_export.h" #include "content/public/browser/browser_child_process_host_delegate.h" #include "content/public/browser/browser_child_process_host_iterator.h" #include "googleurl/src/gurl.h" diff --git a/content/common/child_process_host_impl.cc b/content/common/child_process_host_impl.cc index 77d037c..606811d 100644 --- a/content/common/child_process_host_impl.cc +++ b/content/common/child_process_host_impl.cc @@ -8,7 +8,7 @@ #include "base/atomicops.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" diff --git a/content/common/gpu/media/mac_video_decode_accelerator.mm b/content/common/gpu/media/mac_video_decode_accelerator.mm index ed8f2e6..cfc3077 100644 --- a/content/common/gpu/media/mac_video_decode_accelerator.mm +++ b/content/common/gpu/media/mac_video_decode_accelerator.mm @@ -5,14 +5,14 @@ #include "content/common/gpu/media/mac_video_decode_accelerator.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" +#include "base/location.h" #import "base/mac/foundation_util.h" #import "base/memory/ref_counted_memory.h" #import "base/message_loop.h" -#include "base/location.h" #include "base/native_library.h" -#include "ui/surface/io_surface_support_mac.h" #include "ui/gfx/video_decode_acceleration_support_mac.h" +#include "ui/surface/io_surface_support_mac.h" namespace content { diff --git a/content/common/mac/font_loader.mm b/content/common/mac/font_loader.mm index b309ab9..faf965f 100644 --- a/content/common/mac/font_loader.mm +++ b/content/common/mac/font_loader.mm @@ -7,8 +7,8 @@ #import <Cocoa/Cocoa.h> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/mac/foundation_util.h" #include "base/mac/mac_util.h" diff --git a/content/common/mime_registry_messages.h b/content/common/mime_registry_messages.h index 6d94189..e698369 100644 --- a/content/common/mime_registry_messages.h +++ b/content/common/mime_registry_messages.h @@ -4,7 +4,7 @@ // Multiply-included message file, so no include guard. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/public/common/common_param_traits.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_param_traits.h" diff --git a/content/common/resource_dispatcher.cc b/content/common/resource_dispatcher.cc index ce49f4e..9c2535d 100644 --- a/content/common/resource_dispatcher.cc +++ b/content/common/resource_dispatcher.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/compiler_specific.h" #include "base/debug/alias.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" #include "base/shared_memory.h" diff --git a/content/common/sandbox_init_mac.cc b/content/common/sandbox_init_mac.cc index 766497d..8c6fb3d 100644 --- a/content/common/sandbox_init_mac.cc +++ b/content/common/sandbox_init_mac.cc @@ -5,7 +5,7 @@ #include "content/public/common/sandbox_init.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "content/common/sandbox_mac.h" #include "content/public/common/content_switches.h" diff --git a/content/common/sandbox_mac_diraccess_unittest.mm b/content/common/sandbox_mac_diraccess_unittest.mm index 87061a8..f3c8e97 100644 --- a/content/common/sandbox_mac_diraccess_unittest.mm +++ b/content/common/sandbox_mac_diraccess_unittest.mm @@ -10,9 +10,9 @@ extern "C" { } #include "base/file_util.h" -#include "base/file_path.h" -#include "base/test/multiprocess_test.h" +#include "base/files/file_path.h" #include "base/sys_string_conversions.h" +#include "base/test/multiprocess_test.h" #include "base/utf_string_conversions.h" #include "content/common/sandbox_mac.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/common/sandbox_mac_unittest_helper.mm b/content/common/sandbox_mac_unittest_helper.mm index 8635b32..6417e68 100644 --- a/content/common/sandbox_mac_unittest_helper.mm +++ b/content/common/sandbox_mac_unittest_helper.mm @@ -10,7 +10,7 @@ extern "C" { #include <map> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "content/common/sandbox_mac.h" diff --git a/content/common/set_process_title.cc b/content/common/set_process_title.cc index 9641cc6..30b3b70 100644 --- a/content/common/set_process_title.cc +++ b/content/common/set_process_title.cc @@ -19,8 +19,8 @@ #if defined(OS_LINUX) #include <sys/prctl.h> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/process_util.h" #include "base/string_util.h" // Linux/glibc doesn't natively have setproctitle(). diff --git a/content/gpu/gpu_info_collector_win.cc b/content/gpu/gpu_info_collector_win.cc index 12594a3..da9169b8 100644 --- a/content/gpu/gpu_info_collector_win.cc +++ b/content/gpu/gpu_info_collector_win.cc @@ -15,15 +15,15 @@ #include "base/command_line.h" #include "base/debug/trace_event.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" #include "base/scoped_native_library.h" -#include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/threading/thread.h" #include "base/threading/worker_pool.h" #include "base/win/scoped_com_initializer.h" diff --git a/content/plugin/plugin_thread.h b/content/plugin/plugin_thread.h index a8750aa..f967126 100644 --- a/content/plugin/plugin_thread.h +++ b/content/plugin/plugin_thread.h @@ -5,7 +5,7 @@ #ifndef CONTENT_PLUGIN_PLUGIN_THREAD_H_ #define CONTENT_PLUGIN_PLUGIN_THREAD_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/native_library.h" #include "build/build_config.h" #include "content/common/child_thread.h" diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc index 887f581..1b07240 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -4,7 +4,7 @@ #include "content/public/browser/content_browser_client.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "googleurl/src/gurl.h" #include "ui/gfx/image/image_skia.h" diff --git a/content/public/browser/devtools_http_handler_delegate.h b/content/public/browser/devtools_http_handler_delegate.h index 2e3d2e2..6bf0c36 100644 --- a/content/public/browser/devtools_http_handler_delegate.h +++ b/content/public/browser/devtools_http_handler_delegate.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" class GURL; diff --git a/content/public/browser/download_item.h b/content/public/browser/download_item.h index e3e8d32..423f82b 100644 --- a/content/public/browser/download_item.h +++ b/content/public/browser/download_item.h @@ -21,7 +21,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "base/supports_user_data.h" #include "content/public/browser/download_danger_type.h" diff --git a/content/public/browser/download_manager.h b/content/public/browser/download_manager.h index d834ab1..330aa57 100644 --- a/content/public/browser/download_manager.h +++ b/content/public/browser/download_manager.h @@ -32,7 +32,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/sequenced_task_runner_helpers.h" #include "base/time.h" diff --git a/content/public/browser/download_manager_delegate.h b/content/public/browser/download_manager_delegate.h index 8b41161..cce381f 100644 --- a/content/public/browser/download_manager_delegate.h +++ b/content/public/browser/download_manager_delegate.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/time.h" #include "content/common/content_export.h" diff --git a/content/public/browser/download_save_info.h b/content/public/browser/download_save_info.h index 24ad355..6b7a14a 100644 --- a/content/public/browser/download_save_info.h +++ b/content/public/browser/download_save_info.h @@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_DOWNLOAD_SAVE_INFO_H_ #define CONTENT_PUBLIC_BROWSER_DOWNLOAD_SAVE_INFO_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/linked_ptr.h" #include "content/common/content_export.h" #include "net/base/file_stream.h" diff --git a/content/public/browser/storage_partition.h b/content/public/browser/storage_partition.h index a0427fb..a931405 100644 --- a/content/public/browser/storage_partition.h +++ b/content/public/browser/storage_partition.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" class GURL; diff --git a/content/public/common/content_constants.h b/content/public/common/content_constants.h index 3f5af15..57d9112 100644 --- a/content/public/common/content_constants.h +++ b/content/public/common/content_constants.h @@ -9,7 +9,7 @@ #include <stddef.h> // For size_t -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/common/content_export.h" namespace content { diff --git a/content/public/common/file_chooser_params.h b/content/public/common/file_chooser_params.h index 32261d1..7c31254 100644 --- a/content/public/common/file_chooser_params.h +++ b/content/public/common/file_chooser_params.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "content/common/content_export.h" diff --git a/content/public/common/pepper_plugin_info.h b/content/public/common/pepper_plugin_info.h index 057b0469..87b4aa9 100644 --- a/content/public/common/pepper_plugin_info.h +++ b/content/public/common/pepper_plugin_info.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/common/content_export.h" #include "webkit/plugins/ppapi/plugin_module.h" #include "webkit/plugins/webplugininfo.h" diff --git a/content/public/test/render_widget_test.cc b/content/public/test/render_widget_test.cc index 564768b..260776d 100644 --- a/content/public/test/render_widget_test.cc +++ b/content/public/test/render_widget_test.cc @@ -5,16 +5,16 @@ #include "content/public/test/render_widget_test.h" #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted_memory.h" #include "base/stringprintf.h" #include "content/common/view_messages.h" #include "content/renderer/render_view_impl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" -#include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/jpeg_codec.h" #include "ui/gfx/size.h" #include "ui/surface/transport_dib.h" diff --git a/content/public/test/render_widget_test.h b/content/public/test/render_widget_test.h index d163ea1..45a5f74 100644 --- a/content/public/test/render_widget_test.h +++ b/content/public/test/render_widget_test.h @@ -6,7 +6,7 @@ #define CONTENT_PUBLIC_TEST_RENDER_WIDGET_TEST_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/public/test/render_view_test.h" class SkBitmap; diff --git a/content/public/test/test_browser_context.cc b/content/public/test/test_browser_context.cc index 7dc1c84..b3aa752 100644 --- a/content/public/test/test_browser_context.cc +++ b/content/public/test/test_browser_context.cc @@ -4,7 +4,7 @@ #include "content/public/test/test_browser_context.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/test/null_task_runner.h" #include "content/public/test/mock_resource_context.h" #include "net/url_request/url_request_context.h" diff --git a/content/public/test/test_browser_context.h b/content/public/test/test_browser_context.h index 120fd01..fbf4275 100644 --- a/content/public/test/test_browser_context.h +++ b/content/public/test/test_browser_context.h @@ -6,7 +6,7 @@ #define CONTENT_PUBLIC_TEST_TEST_BROWSER_CONTEXT_H_ #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" diff --git a/content/renderer/browser_plugin/browser_plugin_browsertest.cc b/content/renderer/browser_plugin/browser_plugin_browsertest.cc index 5fe4d13..ef49650 100644 --- a/content/renderer/browser_plugin/browser_plugin_browsertest.cc +++ b/content/renderer/browser_plugin/browser_plugin_browsertest.cc @@ -4,8 +4,8 @@ #include "content/renderer/browser_plugin/browser_plugin_browsertest.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/singleton.h" #include "base/path_service.h" #include "content/common/browser_plugin_messages.h" diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc index 7fa3823..d0a4adfd 100644 --- a/content/renderer/gpu/gpu_benchmarking_extension.cc +++ b/content/renderer/gpu/gpu_benchmarking_extension.cc @@ -7,8 +7,8 @@ #include <string> #include "base/base64.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_vector.h" #include "base/string_number_conversions.h" #include "content/common/gpu/gpu_rendering_stats.h" diff --git a/content/renderer/pepper/pepper_directory_reader_host.cc b/content/renderer/pepper/pepper_directory_reader_host.cc index 4aeda9d..2c3846c 100644 --- a/content/renderer/pepper/pepper_directory_reader_host.cc +++ b/content/renderer/pepper/pepper_directory_reader_host.cc @@ -5,7 +5,7 @@ #include "content/renderer/pepper/pepper_directory_reader_host.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "content/public/renderer/renderer_ppapi_host.h" #include "ppapi/c/pp_errors.h" diff --git a/content/renderer/pepper/pepper_file_chooser_host.cc b/content/renderer/pepper/pepper_file_chooser_host.cc index 98edda5..29ff737 100644 --- a/content/renderer/pepper/pepper_file_chooser_host.cc +++ b/content/renderer/pepper/pepper_file_chooser_host.cc @@ -4,7 +4,7 @@ #include "content/renderer/pepper/pepper_file_chooser_host.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "content/public/renderer/renderer_ppapi_host.h" #include "content/renderer/render_view_impl.h" diff --git a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc index f49ab533..8517220 100644 --- a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc +++ b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc @@ -2,11 +2,11 @@ // 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/utf_string_conversions.h" #include "content/common/view_messages.h" -#include "content/public/test/render_view_test.h" #include "content/public/common/file_chooser_params.h" +#include "content/public/test/render_view_test.h" #include "content/renderer/pepper/mock_renderer_ppapi_host.h" #include "content/renderer/pepper/pepper_file_chooser_host.h" #include "content/renderer/render_view_impl.h" diff --git a/content/renderer/pepper/pepper_hung_plugin_filter.h b/content/renderer/pepper/pepper_hung_plugin_filter.h index 20b8ae5..7cbecf0 100644 --- a/content/renderer/pepper/pepper_hung_plugin_filter.h +++ b/content/renderer/pepper/pepper_hung_plugin_filter.h @@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_HUNG_PLUGIN_FILTER_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_HUNG_PLUGIN_FILTER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/message_loop_proxy.h" #include "base/synchronization/lock.h" diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc index 8366161..5217709 100644 --- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc +++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/file_util_proxy.h" #include "base/logging.h" #include "base/strings/string_split.h" diff --git a/content/renderer/pepper/renderer_ppapi_host_impl.cc b/content/renderer/pepper/renderer_ppapi_host_impl.cc index 2e9bdb8b..50b4fc7 100644 --- a/content/renderer/pepper/renderer_ppapi_host_impl.cc +++ b/content/renderer/pepper/renderer_ppapi_host_impl.cc @@ -4,7 +4,7 @@ #include "content/renderer/pepper/renderer_ppapi_host_impl.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "content/renderer/pepper/pepper_graphics_2d_host.h" #include "content/renderer/pepper/pepper_in_process_resource_creation.h" diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index f9b759f..3649775 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -5,17 +5,17 @@ #include "content/renderer/renderer_webkitplatformsupport_impl.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/metrics/histogram.h" #include "base/platform_file.h" #include "base/shared_memory.h" #include "base/utf_string_conversions.h" #include "content/common/database_util.h" +#include "content/common/file_utilities_messages.h" #include "content/common/fileapi/webblobregistry_impl.h" #include "content/common/fileapi/webfilesystem_impl.h" -#include "content/common/file_utilities_messages.h" #include "content/common/indexed_db/proxy_webidbfactory_impl.h" #include "content/common/mime_registry_messages.h" #include "content/common/npobject_util.h" @@ -63,8 +63,8 @@ #endif #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -#include <string> #include <map> +#include <string> #include "base/synchronization/lock.h" #include "content/common/child_process_sandbox_support_impl_linux.h" diff --git a/content/shell/android/browsertests_apk/content_browser_tests_android.cc b/content/shell/android/browsertests_apk/content_browser_tests_android.cc index 9a2fd46..3eba884 100644 --- a/content/shell/android/browsertests_apk/content_browser_tests_android.cc +++ b/content/shell/android/browsertests_apk/content_browser_tests_android.cc @@ -13,8 +13,8 @@ #include "base/android/scoped_java_ref.h" #include "base/base_switches.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/content/shell/paths_mac.h b/content/shell/paths_mac.h index ac1f4f9..b906564 100644 --- a/content/shell/paths_mac.h +++ b/content/shell/paths_mac.h @@ -5,7 +5,7 @@ #ifndef CONTENT_SHELL_PATHS_MAC_H_ #define CONTENT_SHELL_PATHS_MAC_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" // Sets up base::mac::FrameworkBundle. void OverrideFrameworkBundlePath(); diff --git a/content/shell/shell_browser_context.h b/content/shell/shell_browser_context.h index 44e0a16..fa61e66 100644 --- a/content/shell/shell_browser_context.h +++ b/content/shell/shell_browser_context.h @@ -6,7 +6,7 @@ #define CONTENT_SHELL_SHELL_BROWSER_CONTEXT_H_ #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/browser_context.h" diff --git a/content/shell/shell_browser_main.cc b/content/shell/shell_browser_main.cc index 182f7a2..4b266d9 100644 --- a/content/shell/shell_browser_main.cc +++ b/content/shell/shell_browser_main.cc @@ -7,8 +7,8 @@ #include <iostream> #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/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/content/shell/shell_browser_main_parts.cc b/content/shell/shell_browser_main_parts.cc index dd81bce..fee6852 100644 --- a/content/shell/shell_browser_main_parts.cc +++ b/content/shell/shell_browser_main_parts.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/string_number_conversions.h" #include "base/threading/thread.h" @@ -25,8 +25,8 @@ #include "ui/base/resource/resource_bundle.h" #if defined(OS_ANDROID) -#include "net/base/network_change_notifier.h" #include "net/android/network_change_notifier_factory_android.h" +#include "net/base/network_change_notifier.h" #endif #if defined(USE_AURA) && defined(USE_X11) diff --git a/content/shell/shell_content_browser_client.h b/content/shell/shell_content_browser_client.h index 40902ff..8c1b199 100644 --- a/content/shell/shell_content_browser_client.h +++ b/content/shell/shell_content_browser_client.h @@ -8,7 +8,7 @@ #include <string> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/content_browser_client.h" diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc index fdbd098..133494b 100644 --- a/content/shell/shell_main_delegate.cc +++ b/content/shell/shell_main_delegate.cc @@ -5,7 +5,7 @@ #include "content/shell/shell_main_delegate.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "content/public/browser/browser_main_runner.h" @@ -42,8 +42,8 @@ #endif // OS_MACOSX #if defined(OS_WIN) -#include "base/logging_win.h" #include <initguid.h> +#include "base/logging_win.h" #endif namespace { diff --git a/content/shell/shell_message_filter.h b/content/shell/shell_message_filter.h index 82dd350..f7697e4 100644 --- a/content/shell/shell_message_filter.h +++ b/content/shell/shell_message_filter.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/public/browser/browser_message_filter.h" namespace quota { diff --git a/content/shell/shell_render_process_observer.h b/content/shell/shell_render_process_observer.h index 2d587a5..ec09926 100644 --- a/content/shell/shell_render_process_observer.h +++ b/content/shell/shell_render_process_observer.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "content/public/renderer/render_process_observer.h" diff --git a/content/shell/shell_url_request_context_getter.h b/content/shell/shell_url_request_context_getter.h index e631a18..23f79d1 100644 --- a/content/shell/shell_url_request_context_getter.h +++ b/content/shell/shell_url_request_context_getter.h @@ -6,7 +6,7 @@ #define CONTENT_SHELL_SHELL_URL_REQUEST_CONTEXT_GETTER_H_ #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "net/url_request/url_request_context_getter.h" diff --git a/content/shell/webkit_test_controller.h b/content/shell/webkit_test_controller.h index 6ca620c..a546e5a 100644 --- a/content/shell/webkit_test_controller.h +++ b/content/shell/webkit_test_controller.h @@ -9,7 +9,7 @@ #include <string> #include "base/cancelable_callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/synchronization/lock.h" #include "base/threading/non_thread_safe.h" #include "content/public/browser/notification_observer.h" diff --git a/content/shell/webkit_test_platform_support_linux.cc b/content/shell/webkit_test_platform_support_linux.cc index 82111da..42d4d68 100644 --- a/content/shell/webkit_test_platform_support_linux.cc +++ b/content/shell/webkit_test_platform_support_linux.cc @@ -9,8 +9,8 @@ #include <fontconfig/fontconfig.h> #include <unistd.h> -#include "base/file_path.h" -#include "base/file_path.h" +#include "base/files/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" namespace content { diff --git a/content/shell/webkit_test_runner.h b/content/shell/webkit_test_runner.h index 07b5d09..39da167 100644 --- a/content/shell/webkit_test_runner.h +++ b/content/shell/webkit_test_runner.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "content/public/renderer/render_view_observer.h" #include "content/public/renderer/render_view_observer_tracker.h" diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc index 74cee29..aa91303 100644 --- a/content/test/content_browser_test.cc +++ b/content/test/content_browser_test.cc @@ -5,7 +5,7 @@ #include "content/test/content_browser_test.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/path_service.h" diff --git a/content/test/content_browser_test_utils.cc b/content/test/content_browser_test_utils.cc index b1c2e51..c67050c 100644 --- a/content/test/content_browser_test_utils.cc +++ b/content/test/content_browser_test_utils.cc @@ -5,7 +5,7 @@ #include "content/test/content_browser_test_utils.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/run_loop.h" #include "content/public/browser/navigation_controller.h" diff --git a/content/test/gpu/gpu_test_expectations_parser.h b/content/test/gpu/gpu_test_expectations_parser.h index c80a280..d1fa23a 100644 --- a/content/test/gpu/gpu_test_expectations_parser.h +++ b/content/test/gpu/gpu_test_expectations_parser.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/test/gpu/gpu_test_config.h" class GPUTestExpectationsParser { diff --git a/content/test/layout_browsertest.cc b/content/test/layout_browsertest.cc index 8b15d81..0140aff 100644 --- a/content/test/layout_browsertest.cc +++ b/content/test/layout_browsertest.cc @@ -7,8 +7,8 @@ #include <sstream> #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/path_service.h" #include "base/rand_util.h" diff --git a/content/test/layout_browsertest.h b/content/test/layout_browsertest.h index 626ef5c..5977cf7 100644 --- a/content/test/layout_browsertest.h +++ b/content/test/layout_browsertest.h @@ -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/files/scoped_temp_dir.h" #include "content/test/content_browser_test.h" diff --git a/content/test/layout_test_http_server.h b/content/test/layout_test_http_server.h index 66035b6..80587f7 100644 --- a/content/test/layout_test_http_server.h +++ b/content/test/layout_test_http_server.h @@ -6,7 +6,7 @@ #define CONTENT_TEST_LAYOUT_TEST_HTTP_SERVER_H_ #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #if defined(OS_WIN) #include "base/win/scoped_handle.h" diff --git a/content/test/test_content_browser_client.cc b/content/test/test_content_browser_client.cc index c1c054b..05dcd12 100644 --- a/content/test/test_content_browser_client.cc +++ b/content/test/test_content_browser_client.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "content/test/test_web_contents_view.h" #include "googleurl/src/gurl.h" diff --git a/content/test/test_content_client.cc b/content/test/test_content_client.cc index 4b0f72a..fa09e9f 100644 --- a/content/test/test_content_client.cc +++ b/content/test/test_content_client.cc @@ -5,7 +5,7 @@ #include "content/test/test_content_client.h" #include "base/base_paths.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/string_piece.h" diff --git a/content/test/webrtc_audio_device_test.h b/content/test/webrtc_audio_device_test.h index 3f10bb6..71327b6 100644 --- a/content/test/webrtc_audio_device_test.h +++ b/content/test/webrtc_audio_device_test.h @@ -7,7 +7,7 @@ #include <string> -#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/message_loop.h" diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc index 69b743a..4febffa 100644 --- a/content/utility/utility_thread_impl.cc +++ b/content/utility/utility_thread_impl.cc @@ -7,7 +7,7 @@ #include <stddef.h> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_vector.h" #include "content/common/child_process.h" #include "content/common/child_process_messages.h" diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc index 5396e44..1035d63 100644 --- a/content/zygote/zygote_main_linux.cc +++ b/content/zygote/zygote_main_linux.cc @@ -14,7 +14,7 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/hash_tables.h" #include "base/linux_util.h" #include "base/memory/scoped_ptr.h" diff --git a/courgette/courgette.h b/courgette/courgette.h index 6d3112d..91b9038 100644 --- a/courgette/courgette.h +++ b/courgette/courgette.h @@ -7,7 +7,7 @@ #include <stddef.h> // Required to define size_t on GCC -#include "base/file_path.h" +#include "base/files/file_path.h" namespace courgette { diff --git a/courgette/courgette_tool.cc b/courgette/courgette_tool.cc index 95c7824..4cc29f7 100644 --- a/courgette/courgette_tool.cc +++ b/courgette/courgette_tool.cc @@ -2,21 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <vector> #include <string> +#include <vector> #include "base/at_exit.h" #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "courgette/third_party/bsdiff.h" #include "courgette/courgette.h" #include "courgette/streams.h" +#include "courgette/third_party/bsdiff.h" void PrintHelp() { diff --git a/courgette/memory_allocator.h b/courgette/memory_allocator.h index 08defe4..eaef989 100644 --- a/courgette/memory_allocator.h +++ b/courgette/memory_allocator.h @@ -8,7 +8,7 @@ #include <memory> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/platform_file.h" diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc index b68874c..a53fa40 100644 --- a/crypto/nss_util.cc +++ b/crypto/nss_util.cc @@ -25,8 +25,8 @@ #include "base/debug/alias.h" #include "base/environment.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/lazy_instance.h" #include "base/logging.h" diff --git a/device/bluetooth/bluetooth_service_record_chromeos_unittest.cc b/device/bluetooth/bluetooth_service_record_chromeos_unittest.cc index bd9e591..df4bab7 100644 --- a/device/bluetooth/bluetooth_service_record_chromeos_unittest.cc +++ b/device/bluetooth/bluetooth_service_record_chromeos_unittest.cc @@ -8,8 +8,8 @@ #include "base/base_paths.h" #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "device/bluetooth/bluetooth_service_record_chromeos.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/gpu/tools/compositor_model_bench/compositor_model_bench.cc b/gpu/tools/compositor_model_bench/compositor_model_bench.cc index ea24cd7..8139896 100644 --- a/gpu/tools/compositor_model_bench/compositor_model_bench.cc +++ b/gpu/tools/compositor_model_bench/compositor_model_bench.cc @@ -25,8 +25,8 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/time.h" diff --git a/gpu/tools/compositor_model_bench/render_tree.cc b/gpu/tools/compositor_model_bench/render_tree.cc index bd2b99a..2e23186 100644 --- a/gpu/tools/compositor_model_bench/render_tree.cc +++ b/gpu/tools/compositor_model_bench/render_tree.cc @@ -7,8 +7,8 @@ #include <sstream> #include <vector> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h" diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc index 615704a..17b3641 100644 --- a/ipc/ipc_channel_posix.cc +++ b/ipc/ipc_channel_posix.cc @@ -7,9 +7,9 @@ #include <errno.h> #include <fcntl.h> #include <stddef.h> -#include <sys/types.h> #include <sys/socket.h> #include <sys/stat.h> +#include <sys/types.h> #include <sys/un.h> #include <unistd.h> @@ -17,12 +17,12 @@ #include <sys/uio.h> #endif -#include <string> #include <map> +#include <string> #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/ipc/ipc_channel_posix_unittest.cc b/ipc/ipc_channel_posix_unittest.cc index cdf54da..448e648 100644 --- a/ipc/ipc_channel_posix_unittest.cc +++ b/ipc/ipc_channel_posix_unittest.cc @@ -12,8 +12,8 @@ #include <unistd.h> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/path_service.h" diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc index c2191ce..2081204 100644 --- a/ipc/ipc_message_utils.cc +++ b/ipc/ipc_message_utils.cc @@ -4,7 +4,7 @@ #include "ipc/ipc_message_utils.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" #include "base/nullable_string16.h" diff --git a/ipc/ipc_message_utils_unittest.cc b/ipc/ipc_message_utils_unittest.cc index 24cddc7..2156eeb 100644 --- a/ipc/ipc_message_utils_unittest.cc +++ b/ipc/ipc_message_utils_unittest.cc @@ -4,7 +4,7 @@ #include "ipc/ipc_message_utils.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "ipc/ipc_message.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/audio/mac/audio_device_listener_mac.cc b/media/audio/mac/audio_device_listener_mac.cc index 6121dc6f..65a4854 100644 --- a/media/audio/mac/audio_device_listener_mac.cc +++ b/media/audio/mac/audio_device_listener_mac.cc @@ -5,7 +5,7 @@ #include "media/audio/mac/audio_device_listener_mac.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/mac/libdispatch_task_runner.h" #include "base/mac/mac_logging.h" diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc index be23f95..bd809b8 100644 --- a/media/audio/win/audio_manager_win.cc +++ b/media/audio/win/audio_manager_win.cc @@ -13,7 +13,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/path_service.h" diff --git a/media/base/media_posix.cc b/media/base/media_posix.cc index 34a5811..01d9e5f 100644 --- a/media/base/media_posix.cc +++ b/media/base/media_posix.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/strings/stringize_macros.h" diff --git a/media/base/media_win.cc b/media/base/media_win.cc index d845a55..b6602f9 100644 --- a/media/base/media_win.cc +++ b/media/base/media_win.cc @@ -11,7 +11,7 @@ #endif #include <delayimp.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/native_library.h" #include "base/path_service.h" diff --git a/media/base/test_data_util.h b/media/base/test_data_util.h index 477026f..8d51e96 100644 --- a/media/base/test_data_util.h +++ b/media/base/test_data_util.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/media/ffmpeg/ffmpeg_common_unittest.cc b/media/ffmpeg/ffmpeg_common_unittest.cc index 9624b97..30c065d 100644 --- a/media/ffmpeg/ffmpeg_common_unittest.cc +++ b/media/ffmpeg/ffmpeg_common_unittest.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/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "media/base/media.h" diff --git a/media/ffmpeg/ffmpeg_unittest.cc b/media/ffmpeg/ffmpeg_unittest.cc index f1653c4..a37072e0 100644 --- a/media/ffmpeg/ffmpeg_unittest.cc +++ b/media/ffmpeg/ffmpeg_unittest.cc @@ -12,8 +12,8 @@ #include <queue> #include "base/base_paths.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/perftimer.h" diff --git a/media/filters/blocking_url_protocol_unittest.cc b/media/filters/blocking_url_protocol_unittest.cc index 3b86e72..0e1f844 100644 --- a/media/filters/blocking_url_protocol_unittest.cc +++ b/media/filters/blocking_url_protocol_unittest.cc @@ -3,16 +3,16 @@ // found in the LICENSE file. #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/synchronization/waitable_event.h" #include "media/base/test_data_util.h" +#include "media/ffmpeg/ffmpeg_common.h" #include "media/filters/blocking_url_protocol.h" #include "media/filters/file_data_source.h" -#include "media/ffmpeg/ffmpeg_common.h" -#include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" namespace media { diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc index dc2055b..af2cd92 100644 --- a/media/filters/ffmpeg_demuxer_unittest.cc +++ b/media/filters/ffmpeg_demuxer_unittest.cc @@ -7,8 +7,8 @@ #include <string> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/threading/thread.h" #include "media/base/mock_demuxer_host.h" diff --git a/media/filters/file_data_source.h b/media/filters/file_data_source.h index edf9e81..4c92ba0 100644 --- a/media/filters/file_data_source.h +++ b/media/filters/file_data_source.h @@ -7,8 +7,8 @@ #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "media/base/data_source.h" namespace media { diff --git a/media/filters/file_data_source_unittest.cc b/media/filters/file_data_source_unittest.cc index 782a0db..fc5bfe2 100644 --- a/media/filters/file_data_source_unittest.cc +++ b/media/filters/file_data_source_unittest.cc @@ -6,7 +6,7 @@ #include "base/base_paths.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/utf_string_conversions.h" #include "media/base/mock_data_source_host.h" diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc index b84b3fd..c91b647 100644 --- a/media/test/ffmpeg_tests/ffmpeg_tests.cc +++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc @@ -13,8 +13,8 @@ #include "base/at_exit.h" #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/md5.h" #include "base/path_service.h" diff --git a/media/tools/media_bench/media_bench.cc b/media/tools/media_bench/media_bench.cc index 6910e7e..8c1f170 100644 --- a/media/tools/media_bench/media_bench.cc +++ b/media/tools/media_bench/media_bench.cc @@ -14,8 +14,8 @@ #include "base/at_exit.h" #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/md5.h" #include "base/path_service.h" diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index f7aa03a..96f07b1 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -9,7 +9,7 @@ #include "base/at_exit.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" diff --git a/media/tools/seek_tester/seek_tester.cc b/media/tools/seek_tester/seek_tester.cc index 0249517..ba9f6fb 100644 --- a/media/tools/seek_tester/seek_tester.cc +++ b/media/tools/seek_tester/seek_tester.cc @@ -15,8 +15,8 @@ #include "base/at_exit.h" #include "base/bind.h" +#include "base/files/file_path.h" #include "base/logging.h" -#include "base/file_path.h" #include "base/message_loop.h" #include "base/string_number_conversions.h" #include "media/base/media.h" diff --git a/media/video/capture/screen/screen_capturer_mac.mm b/media/video/capture/screen/screen_capturer_mac.mm index a1d5b07..0419ebd 100644 --- a/media/video/capture/screen/screen_capturer_mac.mm +++ b/media/video/capture/screen/screen_capturer_mac.mm @@ -10,11 +10,11 @@ #include <IOKit/pwr_mgt/IOPMLib.h> #include <OpenGL/CGLMacro.h> #include <OpenGL/OpenGL.h> -#include <set> #include <stddef.h> +#include <set> +#include "base/files/file_path.h" #include "base/logging.h" -#include "base/file_path.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/memory/scoped_ptr.h" diff --git a/media/video/capture/screen/screen_capturer_win.cc b/media/video/capture/screen/screen_capturer_win.cc index d88897f..211baa6 100644 --- a/media/video/capture/screen/screen_capturer_win.cc +++ b/media/video/capture/screen/screen_capturer_win.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/scoped_native_library.h" diff --git a/media/webm/chromeos/webm_encoder.h b/media/webm/chromeos/webm_encoder.h index cced732..126c0d2 100644 --- a/media/webm/chromeos/webm_encoder.h +++ b/media/webm/chromeos/webm_encoder.h @@ -5,10 +5,10 @@ #ifndef MEDIA_WEBM_CHROMEOS_WEBM_ENCODER_H_ #define MEDIA_WEBM_CHROMEOS_WEBM_ENCODER_H_ -#include <stack> #include <stdio.h> +#include <stack> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "media/base/media_export.h" #include "media/webm/chromeos/ebml_writer.h" diff --git a/net/android/keystore_unittest.cc b/net/android/keystore_unittest.cc index 46492c2..f16f8e6 100644 --- a/net/android/keystore_unittest.cc +++ b/net/android/keystore_unittest.cc @@ -19,8 +19,8 @@ #include "base/bind.h" #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_handle.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" diff --git a/net/base/cert_test_util.cc b/net/base/cert_test_util.cc index d384abe..11b9a71 100644 --- a/net/base/cert_test_util.cc +++ b/net/base/cert_test_util.cc @@ -4,8 +4,8 @@ #include "net/base/cert_test_util.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "net/base/ev_root_ca_metadata.h" #include "net/base/x509_certificate.h" diff --git a/net/base/cert_verify_proc_unittest.cc b/net/base/cert_verify_proc_unittest.cc index e440563..165a744 100644 --- a/net/base/cert_verify_proc_unittest.cc +++ b/net/base/cert_verify_proc_unittest.cc @@ -6,9 +6,9 @@ #include <vector> -#include "base/file_path.h" -#include "base/string_number_conversions.h" +#include "base/files/file_path.h" #include "base/sha1.h" +#include "base/string_number_conversions.h" #include "net/base/asn1_util.h" #include "net/base/cert_status_flags.h" #include "net/base/cert_test_util.h" diff --git a/net/base/client_cert_store_impl_unittest.cc b/net/base/client_cert_store_impl_unittest.cc index 761f88c..fb2de79 100644 --- a/net/base/client_cert_store_impl_unittest.cc +++ b/net/base/client_cert_store_impl_unittest.cc @@ -7,7 +7,7 @@ #include <string> #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 "net/base/cert_test_util.h" diff --git a/net/base/directory_lister.h b/net/base/directory_lister.h index f1c5234..999b857 100644 --- a/net/base/directory_lister.h +++ b/net/base/directory_lister.h @@ -7,10 +7,10 @@ #include <vector> -#include "base/file_path.h" #include "base/file_util.h" -#include "base/message_loop_proxy.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" +#include "base/message_loop_proxy.h" #include "net/base/net_export.h" namespace net { diff --git a/net/base/directory_lister_unittest.cc b/net/base/directory_lister_unittest.cc index 07d85ab..8dd2229 100644 --- a/net/base/directory_lister_unittest.cc +++ b/net/base/directory_lister_unittest.cc @@ -2,8 +2,8 @@ // 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/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/i18n/file_util_icu.h" #include "base/logging.h" diff --git a/net/base/file_stream_context_posix.cc b/net/base/file_stream_context_posix.cc index 0c16ef4..d39b17a 100644 --- a/net/base/file_stream_context_posix.cc +++ b/net/base/file_stream_context_posix.cc @@ -7,17 +7,17 @@ #include "net/base/file_stream_context.h" -#include <sys/types.h> -#include <sys/stat.h> +#include <errno.h> #include <fcntl.h> +#include <sys/stat.h> +#include <sys/types.h> #include <unistd.h> -#include <errno.h> #include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram.h" diff --git a/net/base/file_stream_context_win.cc b/net/base/file_stream_context_win.cc index a514ab0..f5656a3 100644 --- a/net/base/file_stream_context_win.cc +++ b/net/base/file_stream_context_win.cc @@ -6,7 +6,7 @@ #include <windows.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/task_runner_util.h" diff --git a/net/base/filter.cc b/net/base/filter.cc index dbda8a6..fcbd25f 100644 --- a/net/base/filter.cc +++ b/net/base/filter.cc @@ -4,7 +4,7 @@ #include "net/base/filter.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "net/base/gzip_filter.h" #include "net/base/io_buffer.h" diff --git a/net/base/mime_util.h b/net/base/mime_util.h index 96d638a..d2638cb 100644 --- a/net/base/mime_util.h +++ b/net/base/mime_util.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "net/base/net_export.h" namespace net { diff --git a/net/base/mock_file_stream.h b/net/base/mock_file_stream.h index 1509b50..a37b495 100644 --- a/net/base/mock_file_stream.h +++ b/net/base/mock_file_stream.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "net/base/file_stream.h" #include "net/base/net_errors.h" diff --git a/net/base/multi_threaded_cert_verifier_unittest.cc b/net/base/multi_threaded_cert_verifier_unittest.cc index f9bab0a..5fccde9 100644 --- a/net/base/multi_threaded_cert_verifier_unittest.cc +++ b/net/base/multi_threaded_cert_verifier_unittest.cc @@ -5,7 +5,7 @@ #include "net/base/multi_threaded_cert_verifier.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/format_macros.h" #include "base/stringprintf.h" #include "net/base/cert_test_util.h" diff --git a/net/base/net_util.cc b/net/base/net_util.cc index ffbbb7a..d5f58e2 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -26,8 +26,8 @@ #endif #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/i18n/file_util_icu.h" #include "base/i18n/icu_string_conversions.h" #include "base/i18n/time_formatting.h" diff --git a/net/base/net_util_posix.cc b/net/base/net_util_posix.cc index 0579ab1..25a58b4 100644 --- a/net/base/net_util_posix.cc +++ b/net/base/net_util_posix.cc @@ -6,7 +6,7 @@ #include <sys/types.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/string_util.h" diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc index 0945b2c..aa12fcc 100644 --- a/net/base/net_util_unittest.cc +++ b/net/base/net_util_unittest.cc @@ -8,7 +8,7 @@ #include <algorithm> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/format_macros.h" #include "base/string_number_conversions.h" #include "base/string_util.h" diff --git a/net/base/net_util_win.cc b/net/base/net_util_win.cc index 62eabcc..fc13222 100644 --- a/net/base/net_util_win.cc +++ b/net/base/net_util_win.cc @@ -9,7 +9,7 @@ #include <algorithm> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/string_piece.h" diff --git a/net/base/nss_cert_database_unittest.cc b/net/base/nss_cert_database_unittest.cc index b5e20b81..bf715f9 100644 --- a/net/base/nss_cert_database_unittest.cc +++ b/net/base/nss_cert_database_unittest.cc @@ -8,8 +8,8 @@ #include <algorithm> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/message_loop.h" #include "base/path_service.h" diff --git a/net/base/platform_mime_util.h b/net/base/platform_mime_util.h index 2cd4e2d..fdc43aa 100644 --- a/net/base/platform_mime_util.h +++ b/net/base/platform_mime_util.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/hash_tables.h" namespace net { diff --git a/net/base/test_data_directory.h b/net/base/test_data_directory.h index 2ed0ed6..81e7152 100644 --- a/net/base/test_data_directory.h +++ b/net/base/test_data_directory.h @@ -5,7 +5,7 @@ #ifndef NET_BASE_TEST_DATA_DIRECTORY_H_ #define NET_BASE_TEST_DATA_DIRECTORY_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" namespace net { diff --git a/net/base/test_root_certs.cc b/net/base/test_root_certs.cc index 83a98d1..084bbef 100644 --- a/net/base/test_root_certs.cc +++ b/net/base/test_root_certs.cc @@ -6,8 +6,8 @@ #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "net/base/x509_certificate.h" diff --git a/net/base/transport_security_state_unittest.cc b/net/base/transport_security_state_unittest.cc index 66f97d6..025faea 100644 --- a/net/base/transport_security_state_unittest.cc +++ b/net/base/transport_security_state_unittest.cc @@ -9,7 +9,7 @@ #include <vector> #include "base/base64.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/sha1.h" #include "base/string_piece.h" #include "crypto/sha2.h" diff --git a/net/base/unix_domain_socket_posix_unittest.cc b/net/base/unix_domain_socket_posix_unittest.cc index c8dfea1..5352a7b 100644 --- a/net/base/unix_domain_socket_posix_unittest.cc +++ b/net/base/unix_domain_socket_posix_unittest.cc @@ -19,8 +19,8 @@ #include "base/bind.h" #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" diff --git a/net/base/upload_data_stream_unittest.cc b/net/base/upload_data_stream_unittest.cc index 76ff088..c639535 100644 --- a/net/base/upload_data_stream_unittest.cc +++ b/net/base/upload_data_stream_unittest.cc @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "base/bind.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/memory/scoped_ptr.h" #include "base/message_loop.h" diff --git a/net/base/upload_element.h b/net/base/upload_element.h index fceb747..3c91e02 100644 --- a/net/base/upload_element.h +++ b/net/base/upload_element.h @@ -8,7 +8,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/time.h" #include "net/base/net_export.h" diff --git a/net/base/upload_file_element_reader.h b/net/base/upload_file_element_reader.h index 392cf7c..9fe8500a 100644 --- a/net/base/upload_file_element_reader.h +++ b/net/base/upload_file_element_reader.h @@ -6,7 +6,7 @@ #define NET_BASE_UPLOAD_FILE_ELEMENT_READER_H_ #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/net/base/x509_certificate_unittest.cc b/net/base/x509_certificate_unittest.cc index a3d35fa..0c0a32d 100644 --- a/net/base/x509_certificate_unittest.cc +++ b/net/base/x509_certificate_unittest.cc @@ -5,7 +5,7 @@ #include "net/base/x509_certificate.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/pickle.h" #include "base/sha1.h" diff --git a/net/disk_cache/backend_impl.cc b/net/disk_cache/backend_impl.cc index c92c9ee..f870531 100644 --- a/net/disk_cache/backend_impl.cc +++ b/net/disk_cache/backend_impl.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/hash.h" #include "base/message_loop.h" #include "base/metrics/field_trial.h" @@ -17,8 +17,8 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/sys_info.h" -#include "base/threading/worker_pool.h" #include "base/threading/thread_restrictions.h" +#include "base/threading/worker_pool.h" #include "base/time.h" #include "base/timer.h" #include "net/base/net_errors.h" diff --git a/net/disk_cache/backend_impl.h b/net/disk_cache/backend_impl.h index c5314c0..19aedbe 100644 --- a/net/disk_cache/backend_impl.h +++ b/net/disk_cache/backend_impl.h @@ -7,7 +7,7 @@ #ifndef NET_DISK_CACHE_BACKEND_IMPL_H_ #define NET_DISK_CACHE_BACKEND_IMPL_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/hash_tables.h" #include "base/timer.h" #include "net/disk_cache/block_files.h" diff --git a/net/disk_cache/block_files.h b/net/disk_cache/block_files.h index cb0cf6d..47b9679 100644 --- a/net/disk_cache/block_files.h +++ b/net/disk_cache/block_files.h @@ -9,7 +9,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "net/base/net_export.h" diff --git a/net/disk_cache/cache_util_win.cc b/net/disk_cache/cache_util_win.cc index 02f7365..8c54b91 100644 --- a/net/disk_cache/cache_util_win.cc +++ b/net/disk_cache/cache_util_win.cc @@ -6,7 +6,7 @@ #include <windows.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/win/scoped_handle.h" diff --git a/net/disk_cache/disk_cache_test_base.h b/net/disk_cache/disk_cache_test_base.h index 8540af2..b9a18df 100644 --- a/net/disk_cache/disk_cache_test_base.h +++ b/net/disk_cache/disk_cache_test_base.h @@ -6,7 +6,7 @@ #define NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread.h" diff --git a/net/disk_cache/disk_cache_test_util.h b/net/disk_cache/disk_cache_test_util.h index 2e8f8b4..f6d1f46 100644 --- a/net/disk_cache/disk_cache_test_util.h +++ b/net/disk_cache/disk_cache_test_util.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/timer.h" #include "base/tuple.h" diff --git a/net/disk_cache/file_win.cc b/net/disk_cache/file_win.cc index 6679a0f..422a3ce 100644 --- a/net/disk_cache/file_win.cc +++ b/net/disk_cache/file_win.cc @@ -4,7 +4,7 @@ #include "net/disk_cache/file.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/message_loop.h" #include "net/base/net_errors.h" diff --git a/net/disk_cache/flash/flash_cache_test_base.cc b/net/disk_cache/flash/flash_cache_test_base.cc index a5c7678..b31c499 100644 --- a/net/disk_cache/flash/flash_cache_test_base.cc +++ b/net/disk_cache/flash/flash_cache_test_base.cc @@ -4,7 +4,7 @@ #include "net/disk_cache/flash/flash_cache_test_base.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/time.h" #include "net/disk_cache/flash/format.h" diff --git a/net/disk_cache/flash/storage_unittest.cc b/net/disk_cache/flash/storage_unittest.cc index d76b21d..ca0e56c 100644 --- a/net/disk_cache/flash/storage_unittest.cc +++ b/net/disk_cache/flash/storage_unittest.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/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "net/base/io_buffer.h" #include "net/disk_cache/disk_cache_test_util.h" diff --git a/net/disk_cache/mapped_file_avoid_mmap_posix.cc b/net/disk_cache/mapped_file_avoid_mmap_posix.cc index 061d106..d751c74 100644 --- a/net/disk_cache/mapped_file_avoid_mmap_posix.cc +++ b/net/disk_cache/mapped_file_avoid_mmap_posix.cc @@ -6,7 +6,7 @@ #include <stdlib.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" namespace disk_cache { diff --git a/net/disk_cache/mapped_file_posix.cc b/net/disk_cache/mapped_file_posix.cc index cc5f23e..de5ebb1 100644 --- a/net/disk_cache/mapped_file_posix.cc +++ b/net/disk_cache/mapped_file_posix.cc @@ -7,7 +7,7 @@ #include <errno.h> #include <sys/mman.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "net/disk_cache/disk_cache.h" diff --git a/net/disk_cache/mapped_file_win.cc b/net/disk_cache/mapped_file_win.cc index 7db2ba5..b3ef772 100644 --- a/net/disk_cache/mapped_file_win.cc +++ b/net/disk_cache/mapped_file_win.cc @@ -4,7 +4,7 @@ #include "net/disk_cache/mapped_file.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "net/disk_cache/disk_cache.h" diff --git a/net/disk_cache/stress_cache.cc b/net/disk_cache/stress_cache.cc index 04d6f97..8096caa 100644 --- a/net/disk_cache/stress_cache.cc +++ b/net/disk_cache/stress_cache.cc @@ -21,7 +21,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/debug/debugger.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/path_service.h" @@ -31,9 +31,9 @@ #include "base/threading/platform_thread.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" +#include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" -#include "net/base/io_buffer.h" #include "net/disk_cache/backend_impl.h" #include "net/disk_cache/disk_cache.h" #include "net/disk_cache/disk_cache_test_util.h" diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc index 0b80251..797985b 100644 --- a/net/dns/dns_config_service_posix.cc +++ b/net/dns/dns_config_service_posix.cc @@ -8,9 +8,9 @@ #include "base/basictypes.h" #include "base/bind.h" -#include "base/files/file_path_watcher.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" +#include "base/files/file_path_watcher.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "base/time.h" diff --git a/net/dns/dns_config_service_win.cc b/net/dns/dns_config_service_win.cc index d511731..782e662 100644 --- a/net/dns/dns_config_service_win.cc +++ b/net/dns/dns_config_service_win.cc @@ -10,8 +10,8 @@ #include "base/bind.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/files/file_path.h" #include "base/files/file_path_watcher.h" -#include "base/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" diff --git a/net/dns/dns_hosts.h b/net/dns/dns_hosts.h index 4068c6c..a75bb27 100644 --- a/net/dns/dns_hosts.h +++ b/net/dns/dns_hosts.h @@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "net/base/address_family.h" #include "net/base/net_export.h" #include "net/base/net_util.h" // can't forward-declare IPAddressNumber diff --git a/net/http/http_auth_gssapi_posix.cc b/net/http/http_auth_gssapi_posix.cc index 2534322..b6f1bd4 100644 --- a/net/http/http_auth_gssapi_posix.cc +++ b/net/http/http_auth_gssapi_posix.cc @@ -8,7 +8,7 @@ #include <string> #include "base/base64.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/format_macros.h" #include "base/logging.h" #include "base/string_util.h" diff --git a/net/http/http_cache.h b/net/http/http_cache.h index 77edff4..a5aba0a 100644 --- a/net/http/http_cache.h +++ b/net/http/http_cache.h @@ -19,13 +19,13 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop_proxy.h" -#include "base/time.h" #include "base/threading/non_thread_safe.h" +#include "base/time.h" #include "net/base/cache_type.h" #include "net/base/completion_callback.h" #include "net/base/load_states.h" diff --git a/net/http/http_network_transaction_spdy2_unittest.cc b/net/http/http_network_transaction_spdy2_unittest.cc index 973876c..68202b3 100644 --- a/net/http/http_network_transaction_spdy2_unittest.cc +++ b/net/http/http_network_transaction_spdy2_unittest.cc @@ -11,8 +11,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" diff --git a/net/http/http_network_transaction_spdy3_unittest.cc b/net/http/http_network_transaction_spdy3_unittest.cc index 7b06f5c..af4ca43 100644 --- a/net/http/http_network_transaction_spdy3_unittest.cc +++ b/net/http/http_network_transaction_spdy3_unittest.cc @@ -11,8 +11,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" diff --git a/net/http/http_stream_parser_unittest.cc b/net/http/http_stream_parser_unittest.cc index 45d172b..3724ae1 100644 --- a/net/http/http_stream_parser_unittest.cc +++ b/net/http/http_stream_parser_unittest.cc @@ -4,8 +4,8 @@ #include "net/http/http_stream_parser.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/memory/ref_counted.h" #include "base/string_piece.h" diff --git a/net/http/infinite_cache.cc b/net/http/infinite_cache.cc index cfbeed0..f8a710b 100644 --- a/net/http/infinite_cache.cc +++ b/net/http/infinite_cache.cc @@ -6,11 +6,11 @@ #include <algorithm> -#include "base/compiler_specific.h" #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" +#include "base/compiler_specific.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/hash.h" #include "base/hash_tables.h" #include "base/location.h" @@ -20,8 +20,8 @@ #include "base/platform_file.h" #include "base/rand_util.h" #include "base/sha1.h" -#include "base/time.h" #include "base/threading/sequenced_worker_pool.h" +#include "base/time.h" #include "net/base/net_errors.h" #include "net/http/http_cache_transaction.h" #include "net/http/http_request_info.h" diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc index 4a91d51..523a55e 100644 --- a/net/proxy/proxy_config_service_linux.cc +++ b/net/proxy/proxy_config_service_linux.cc @@ -20,8 +20,8 @@ #include "base/bind.h" #include "base/compiler_specific.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/nix/xdg_util.h" diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc index f10aa78..4e9409f 100644 --- a/net/proxy/proxy_config_service_linux_unittest.cc +++ b/net/proxy/proxy_config_service_linux_unittest.cc @@ -10,8 +10,8 @@ #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/format_macros.h" #include "base/logging.h" #include "base/string_util.h" diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc index c9604f9..1121ac6 100644 --- a/net/proxy/proxy_script_fetcher_impl_unittest.cc +++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc @@ -6,14 +6,14 @@ #include <string> -#include "base/file_path.h" #include "base/compiler_specific.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/utf_string_conversions.h" +#include "net/base/load_flags.h" #include "net/base/mock_cert_verifier.h" #include "net/base/mock_host_resolver.h" #include "net/base/net_util.h" -#include "net/base/load_flags.h" #include "net/base/ssl_config_service_defaults.h" #include "net/base/test_completion_callback.h" #include "net/disk_cache/disk_cache.h" diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc index b7a3dd8..1608b9f 100644 --- a/net/socket/ssl_server_socket_unittest.cc +++ b/net/socket/ssl_server_socket_unittest.cc @@ -20,8 +20,8 @@ #include <queue> #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/path_service.h" #include "crypto/nss_util.h" diff --git a/net/socket/tcp_client_socket.cc b/net/socket/tcp_client_socket.cc index ac13994..dbd2105 100644 --- a/net/socket/tcp_client_socket.cc +++ b/net/socket/tcp_client_socket.cc @@ -4,8 +4,8 @@ #include "net/socket/tcp_client_socket.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" namespace net { diff --git a/net/test/base_test_server.h b/net/test/base_test_server.h index de4fe1d..898632e 100644 --- a/net/test/base_test_server.h +++ b/net/test/base_test_server.h @@ -10,7 +10,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "net/base/host_port_pair.h" diff --git a/net/test/python_utils.cc b/net/test/python_utils.cc index 349a360..483aed7 100644 --- a/net/test/python_utils.cc +++ b/net/test/python_utils.cc @@ -7,8 +7,8 @@ #include "base/base_paths.h" #include "base/command_line.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/net/test/python_utils_unittest.cc b/net/test/python_utils_unittest.cc index 1c7a3c3..6d5a041 100644 --- a/net/test/python_utils_unittest.cc +++ b/net/test/python_utils_unittest.cc @@ -6,11 +6,11 @@ #include "base/command_line.h" #include "base/environment.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/process_util.h" -#include "base/stringprintf.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "net/test/python_utils.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/test/remote_test_server.cc b/net/test/remote_test_server.cc index a4eab05..d398efb 100644 --- a/net/test/remote_test_server.cc +++ b/net/test/remote_test_server.cc @@ -7,8 +7,8 @@ #include <vector> #include "base/base_paths.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/path_service.h" diff --git a/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc b/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc index 83e76e3..19091b7 100644 --- a/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc +++ b/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc @@ -8,8 +8,8 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" diff --git a/net/tools/dump_cache/cache_dumper.h b/net/tools/dump_cache/cache_dumper.h index 261c2b2..12569af 100644 --- a/net/tools/dump_cache/cache_dumper.h +++ b/net/tools/dump_cache/cache_dumper.h @@ -7,8 +7,8 @@ #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "net/disk_cache/backend_impl.h" #ifdef WIN32 diff --git a/net/tools/dump_cache/dump_files.h b/net/tools/dump_cache/dump_files.h index a3a67a6..d89e077 100644 --- a/net/tools/dump_cache/dump_files.h +++ b/net/tools/dump_cache/dump_files.h @@ -9,7 +9,7 @@ // to the actual files (they still may change if an error is detected on the // files). -#include "base/file_path.h" +#include "base/files/file_path.h" // Returns the major version of the specified cache. int GetMajorVersion(const base::FilePath& input_path); diff --git a/net/tools/dump_cache/simple_cache_dumper.h b/net/tools/dump_cache/simple_cache_dumper.h index 1b28629..33b6d76 100644 --- a/net/tools/dump_cache/simple_cache_dumper.h +++ b/net/tools/dump_cache/simple_cache_dumper.h @@ -5,7 +5,7 @@ #ifndef NET_TOOLS_DUMP_CACHE_SIMPLE_CACHE_DUMPER_H_ #define NET_TOOLS_DUMP_CACHE_SIMPLE_CACHE_DUMPER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread.h" #include "net/base/completion_callback.h" diff --git a/net/tools/dump_cache/upgrade_win.h b/net/tools/dump_cache/upgrade_win.h index 79ea50e..a3d6d22 100644 --- a/net/tools/dump_cache/upgrade_win.h +++ b/net/tools/dump_cache/upgrade_win.h @@ -5,7 +5,7 @@ #include <windows.h> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" // Creates a new server, and returns a new named pipe to communicate with it. diff --git a/net/tools/testserver/run_testserver.cc b/net/tools/testserver/run_testserver.cc index 85af4d5..3362cfd 100644 --- a/net/tools/testserver/run_testserver.cc +++ b/net/tools/testserver/run_testserver.cc @@ -6,7 +6,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/message_loop.h" #include "base/test/test_timeouts.h" diff --git a/net/tools/tld_cleanup/tld_cleanup.cc b/net/tools/tld_cleanup/tld_cleanup.cc index db66c4c..1162d98 100644 --- a/net/tools/tld_cleanup/tld_cleanup.cc +++ b/net/tools/tld_cleanup/tld_cleanup.cc @@ -32,10 +32,10 @@ #include "base/at_exit.h" #include "base/command_line.h" #include "base/file_util.h" +#include "base/file_util.h" +#include "base/files/file_path.h" #include "base/i18n/icu_util.h" #include "base/logging.h" -#include "base/file_path.h" -#include "base/file_util.h" #include "base/path_service.h" #include "base/process_util.h" #include "base/string_util.h" diff --git a/net/url_request/url_fetcher_core.h b/net/url_request/url_fetcher_core.h index 8c1a49c..082b994 100644 --- a/net/url_request/url_fetcher_core.h +++ b/net/url_request/url_fetcher_core.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/debug/stack_trace.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/net/url_request/url_request_context_builder.h b/net/url_request/url_request_context_builder.h index f1ce570..b11ccfa 100644 --- a/net/url_request/url_request_context_builder.h +++ b/net/url_request/url_request_context_builder.h @@ -17,7 +17,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "build/build_config.h" diff --git a/net/url_request/url_request_file_dir_job.h b/net/url_request/url_request_file_dir_job.h index 630c2d4..5e5005f 100644 --- a/net/url_request/url_request_file_dir_job.h +++ b/net/url_request/url_request_file_dir_job.h @@ -7,8 +7,8 @@ #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "net/base/directory_lister.h" #include "net/url_request/url_request_job.h" diff --git a/net/url_request/url_request_file_job.h b/net/url_request/url_request_file_job.h index 2343711..0d9e192 100644 --- a/net/url_request/url_request_file_job.h +++ b/net/url_request/url_request_file_job.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "net/base/net_export.h" #include "net/http/http_byte_range.h" diff --git a/ppapi/proxy/flash_file_resource.cc b/ppapi/proxy/flash_file_resource.cc index cd13a6d..a7db4c00a 100644 --- a/ppapi/proxy/flash_file_resource.cc +++ b/ppapi/proxy/flash_file_resource.cc @@ -4,7 +4,7 @@ #include "ppapi/proxy/flash_file_resource.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "ipc/ipc_message.h" #include "ppapi/c/pp_errors.h" #include "ppapi/proxy/ppapi_messages.h" diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h index f27c803..afe63e3 100644 --- a/ppapi/proxy/ppapi_messages.h +++ b/ppapi/proxy/ppapi_messages.h @@ -7,7 +7,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process.h" #include "base/shared_memory.h" #include "base/string16.h" diff --git a/ppapi/shared_impl/dir_contents.h b/ppapi/shared_impl/dir_contents.h index 0c32a03..4d895b5 100644 --- a/ppapi/shared_impl/dir_contents.h +++ b/ppapi/shared_impl/dir_contents.h @@ -8,7 +8,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" namespace ppapi { diff --git a/ppapi/shared_impl/file_path.h b/ppapi/shared_impl/file_path.h index ff47549..7027e81 100644 --- a/ppapi/shared_impl/file_path.h +++ b/ppapi/shared_impl/file_path.h @@ -5,7 +5,7 @@ #ifndef PPAPI_SHARED_IMPL_FILE_PATH_H_ #define PPAPI_SHARED_IMPL_FILE_PATH_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "ppapi/shared_impl/ppapi_shared_export.h" namespace ppapi { diff --git a/printing/backend/win_helper.cc b/printing/backend/win_helper.cc index b3b6724..5a59220 100644 --- a/printing/backend/win_helper.cc +++ b/printing/backend/win_helper.cc @@ -6,8 +6,8 @@ #include <algorithm> -#include "base/file_path.h" #include "base/file_version_info.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/utf_string_conversions.h" diff --git a/printing/emf_win.cc b/printing/emf_win.cc index 6617deb..5c01c4b2 100644 --- a/printing/emf_win.cc +++ b/printing/emf_win.cc @@ -4,7 +4,7 @@ #include "printing/emf_win.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/win/scoped_gdi_object.h" diff --git a/printing/emf_win_unittest.cc b/printing/emf_win_unittest.cc index bb3164d..0f5e6ca 100644 --- a/printing/emf_win_unittest.cc +++ b/printing/emf_win_unittest.cc @@ -11,8 +11,8 @@ #include <string> #include "base/basictypes.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/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/printing/pdf_metafile_cg_mac.cc b/printing/pdf_metafile_cg_mac.cc index 6090809..1d180fe 100644 --- a/printing/pdf_metafile_cg_mac.cc +++ b/printing/pdf_metafile_cg_mac.cc @@ -6,7 +6,7 @@ #include <algorithm> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/mac/mac_util.h" diff --git a/printing/printed_document.cc b/printing/printed_document.cc index 32a8809..714f13d 100644 --- a/printing/printed_document.cc +++ b/printing/printed_document.cc @@ -9,18 +9,18 @@ #include <string> #include <vector> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/i18n/file_util_icu.h" +#include "base/i18n/time_formatting.h" #include "base/lazy_instance.h" #include "base/message_loop.h" -#include "base/stringprintf.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/utf_string_conversions.h" -#include "base/i18n/time_formatting.h" #include "printing/page_number.h" -#include "printing/printed_pages_source.h" #include "printing/printed_page.h" +#include "printing/printed_pages_source.h" #include "printing/units.h" #include "skia/ext/platform_device.h" #include "ui/base/text/text_elider.h" diff --git a/remoting/base/auto_thread_unittest.cc b/remoting/base/auto_thread_unittest.cc index 5d449c7..cfbb86b 100644 --- a/remoting/base/auto_thread_unittest.cc +++ b/remoting/base/auto_thread_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/scoped_native_library.h" #include "remoting/base/auto_thread.h" diff --git a/remoting/base/resources.cc b/remoting/base/resources.cc index e10659d3..933be87 100644 --- a/remoting/base/resources.cc +++ b/remoting/base/resources.cc @@ -4,7 +4,7 @@ #include "remoting/base/resources.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" diff --git a/remoting/host/audio_capturer_linux.cc b/remoting/host/audio_capturer_linux.cc index 3dd6d68..e98654a 100644 --- a/remoting/host/audio_capturer_linux.cc +++ b/remoting/host/audio_capturer_linux.cc @@ -4,7 +4,7 @@ #include "remoting/host/audio_capturer_linux.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "remoting/proto/audio.pb.h" diff --git a/remoting/host/branding.h b/remoting/host/branding.h index a076bda..cac6967 100644 --- a/remoting/host/branding.h +++ b/remoting/host/branding.h @@ -5,7 +5,7 @@ #ifndef REMOTING_HOST_BRANDING_H_ #define REMOTING_HOST_BRANDING_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" namespace remoting { diff --git a/remoting/host/config_file_watcher.h b/remoting/host/config_file_watcher.h index 9762296..f6fe266 100644 --- a/remoting/host/config_file_watcher.h +++ b/remoting/host/config_file_watcher.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" namespace base { diff --git a/remoting/host/config_file_watcher_unittest.cc b/remoting/host/config_file_watcher_unittest.cc index 507190c..42fea39 100644 --- a/remoting/host/config_file_watcher_unittest.cc +++ b/remoting/host/config_file_watcher_unittest.cc @@ -4,8 +4,8 @@ #include "remoting/host/config_file_watcher.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/run_loop.h" #include "remoting/base/auto_thread.h" diff --git a/remoting/host/daemon_process.cc b/remoting/host/daemon_process.cc index 84f5b916..f76838d 100644 --- a/remoting/host/daemon_process.cc +++ b/remoting/host/daemon_process.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/single_thread_task_runner.h" #include "remoting/base/auto_thread_task_runner.h" #include "remoting/host/branding.h" diff --git a/remoting/host/desktop_session_win.h b/remoting/host/desktop_session_win.h index 53b2fef..57ebb309 100644 --- a/remoting/host/desktop_session_win.h +++ b/remoting/host/desktop_session_win.h @@ -5,7 +5,7 @@ #ifndef REMOTING_HOST_DESKTOP_SESSION_WIN_H_ #define REMOTING_HOST_DESKTOP_SESSION_WIN_H_ -#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/win/scoped_handle.h" diff --git a/remoting/host/ipc_constants.h b/remoting/host/ipc_constants.h index abe6899..3d80715 100644 --- a/remoting/host/ipc_constants.h +++ b/remoting/host/ipc_constants.h @@ -5,7 +5,7 @@ #ifndef REMOTING_HOST_IPC_CONSTANTS_H_ #define REMOTING_HOST_IPC_CONSTANTS_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" namespace remoting { diff --git a/remoting/host/json_host_config.h b/remoting/host/json_host_config.h index c8a4aba..6e2237d 100644 --- a/remoting/host/json_host_config.h +++ b/remoting/host/json_host_config.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "remoting/host/in_memory_host_config.h" namespace base { diff --git a/remoting/host/linux/audio_pipe_reader.cc b/remoting/host/linux/audio_pipe_reader.cc index c66839b..c371c21 100644 --- a/remoting/host/linux/audio_pipe_reader.cc +++ b/remoting/host/linux/audio_pipe_reader.cc @@ -9,7 +9,7 @@ #include <sys/types.h> #include <unistd.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/stl_util.h" diff --git a/remoting/host/policy_hack/policy_watcher_linux.cc b/remoting/host/policy_hack/policy_watcher_linux.cc index 32aac6b..4bd82f9 100644 --- a/remoting/host/policy_hack/policy_watcher_linux.cc +++ b/remoting/host/policy_hack/policy_watcher_linux.cc @@ -16,8 +16,8 @@ #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/file_path_watcher.h" #include "base/json/json_file_value_serializer.h" #include "base/memory/scoped_ptr.h" diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc index b607e76..ec0f13b 100644 --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc @@ -10,8 +10,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/logging.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" diff --git a/remoting/host/sas_injector_win.cc b/remoting/host/sas_injector_win.cc index a9bb80b..663c08d 100644 --- a/remoting/host/sas_injector_win.cc +++ b/remoting/host/sas_injector_win.cc @@ -7,8 +7,8 @@ #include <windows.h> #include <string> +#include "base/files/file_path.h" #include "base/logging.h" -#include "base/file_path.h" #include "base/path_service.h" #include "base/scoped_native_library.h" #include "base/utf_string_conversions.h" diff --git a/remoting/host/setup/daemon_controller_linux.cc b/remoting/host/setup/daemon_controller_linux.cc index 5c19981..f890304 100644 --- a/remoting/host/setup/daemon_controller_linux.cc +++ b/remoting/host/setup/daemon_controller_linux.cc @@ -11,8 +11,8 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/md5.h" diff --git a/remoting/host/setup/daemon_controller_mac.cc b/remoting/host/setup/daemon_controller_mac.cc index 95e1b1f..e36a69b 100644 --- a/remoting/host/setup/daemon_controller_mac.cc +++ b/remoting/host/setup/daemon_controller_mac.cc @@ -11,8 +11,8 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/mac/foundation_util.h" diff --git a/remoting/host/setup/daemon_controller_win.cc b/remoting/host/setup/daemon_controller_win.cc index 5d1ac62..c2897d4 100644 --- a/remoting/host/setup/daemon_controller_win.cc +++ b/remoting/host/setup/daemon_controller_win.cc @@ -10,8 +10,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h" diff --git a/remoting/host/usage_stats_consent_mac.cc b/remoting/host/usage_stats_consent_mac.cc index db82d92..9198307 100644 --- a/remoting/host/usage_stats_consent_mac.cc +++ b/remoting/host/usage_stats_consent_mac.cc @@ -7,7 +7,7 @@ #include <string> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "remoting/host/config_file_watcher.h" #include "remoting/host/json_host_config.h" diff --git a/remoting/host/win/host_service.cc b/remoting/host/win/host_service.cc index b4f1c8a..ba148797 100644 --- a/remoting/host/win/host_service.cc +++ b/remoting/host/win/host_service.cc @@ -14,7 +14,7 @@ #include "base/base_switches.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" diff --git a/remoting/host/win/launch_process_with_token.h b/remoting/host/win/launch_process_with_token.h index bc8157a..cd44d71 100644 --- a/remoting/host/win/launch_process_with_token.h +++ b/remoting/host/win/launch_process_with_token.h @@ -9,7 +9,7 @@ #include <string> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/remoting/host/win/unprivileged_process_delegate.h b/remoting/host/win/unprivileged_process_delegate.h index a0781d3..bdf851b 100644 --- a/remoting/host/win/unprivileged_process_delegate.h +++ b/remoting/host/win/unprivileged_process_delegate.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#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/win/scoped_handle.h" diff --git a/remoting/host/win/wts_console_session_process_driver.cc b/remoting/host/win/wts_console_session_process_driver.cc index 638eaf3..3446bc5 100644 --- a/remoting/host/win/wts_console_session_process_driver.cc +++ b/remoting/host/win/wts_console_session_process_driver.cc @@ -6,7 +6,7 @@ #include "base/base_switches.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/single_thread_task_runner.h" #include "ipc/ipc_message.h" diff --git a/remoting/host/win/wts_session_process_delegate.cc b/remoting/host/win/wts_session_process_delegate.cc index 696cefd..37a8429 100644 --- a/remoting/host/win/wts_session_process_delegate.cc +++ b/remoting/host/win/wts_session_process_delegate.cc @@ -10,8 +10,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" diff --git a/remoting/protocol/authenticator_test_base.cc b/remoting/protocol/authenticator_test_base.cc index 1845098..18de95d 100644 --- a/remoting/protocol/authenticator_test_base.cc +++ b/remoting/protocol/authenticator_test_base.cc @@ -4,8 +4,8 @@ #include "remoting/protocol/authenticator_test_base.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/test/test_timeouts.h" #include "base/timer.h" diff --git a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc index fb93480..eb3d6ce 100644 --- a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc +++ b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc @@ -5,12 +5,12 @@ #include "remoting/protocol/ssl_hmac_channel_authenticator.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" +#include "base/path_service.h" #include "base/test/test_timeouts.h" #include "base/timer.h" -#include "base/path_service.h" #include "crypto/rsa_private_key.h" #include "net/base/net_errors.h" #include "net/base/test_data_directory.h" diff --git a/rlz/chromeos/lib/rlz_value_store_chromeos.h b/rlz/chromeos/lib/rlz_value_store_chromeos.h index e150c3c..29758a4 100644 --- a/rlz/chromeos/lib/rlz_value_store_chromeos.h +++ b/rlz/chromeos/lib/rlz_value_store_chromeos.h @@ -5,7 +5,7 @@ #ifndef RLZ_CHROMEOS_LIB_RLZ_VALUE_STORE_CHROMEOS_H_ #define RLZ_CHROMEOS_LIB_RLZ_VALUE_STORE_CHROMEOS_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/threading/non_thread_safe.h" #include "base/values.h" #include "rlz/lib/rlz_value_store.h" diff --git a/rlz/lib/recursive_cross_process_lock_posix.cc b/rlz/lib/recursive_cross_process_lock_posix.cc index 887216b..8b271f1 100644 --- a/rlz/lib/recursive_cross_process_lock_posix.cc +++ b/rlz/lib/recursive_cross_process_lock_posix.cc @@ -4,13 +4,13 @@ #include "rlz/lib/recursive_cross_process_lock_posix.h" +#include <fcntl.h> #include <sys/file.h> -#include <sys/types.h> #include <sys/stat.h> -#include <fcntl.h> +#include <sys/types.h> #include <unistd.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" diff --git a/rlz/mac/lib/rlz_value_store_mac.mm b/rlz/mac/lib/rlz_value_store_mac.mm index 9601d4c..b174fee 100644 --- a/rlz/mac/lib/rlz_value_store_mac.mm +++ b/rlz/mac/lib/rlz_value_store_mac.mm @@ -4,14 +4,14 @@ #include "rlz/mac/lib/rlz_value_store_mac.h" -#include "base/mac/foundation_util.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" +#include "base/mac/foundation_util.h" #include "base/sys_string_conversions.h" #include "rlz/lib/assert.h" #include "rlz/lib/lib_values.h" -#include "rlz/lib/rlz_lib.h" #include "rlz/lib/recursive_cross_process_lock_posix.h" +#include "rlz/lib/rlz_lib.h" #import <Foundation/Foundation.h> #include <pthread.h> diff --git a/rlz/test/rlz_test_helpers.cc b/rlz/test/rlz_test_helpers.cc index 398d0da..db34cd9 100644 --- a/rlz/test/rlz_test_helpers.cc +++ b/rlz/test/rlz_test_helpers.cc @@ -14,7 +14,7 @@ #include "base/win/registry.h" #include "rlz/win/lib/rlz_lib.h" #elif defined(OS_POSIX) -#include "base/file_path.h" +#include "base/files/file_path.h" #include "rlz/lib/rlz_value_store.h" #endif diff --git a/rlz/test/rlz_unittest_main.cc b/rlz/test/rlz_unittest_main.cc index f2e99cb..2c6386c 100644 --- a/rlz/test/rlz_unittest_main.cc +++ b/rlz/test/rlz_unittest_main.cc @@ -11,7 +11,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_POSIX) -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "rlz/lib/rlz_value_store.h" #endif diff --git a/sandbox/linux/services/broker_process_unittest.cc b/sandbox/linux/services/broker_process_unittest.cc index 7fbc036..ab57035 100644 --- a/sandbox/linux/services/broker_process_unittest.cc +++ b/sandbox/linux/services/broker_process_unittest.cc @@ -15,7 +15,7 @@ #if defined(OS_ANDROID) #include "base/android/path_utils.h" #endif -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "sandbox/linux/tests/unit_tests.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sql/connection.cc b/sql/connection.cc index c19f6f2..0fda72e 100644 --- a/sql/connection.cc +++ b/sql/connection.cc @@ -6,7 +6,7 @@ #include <string.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/string_util.h" diff --git a/sync/internal_api/public/internal_components_factory.h b/sync/internal_api/public/internal_components_factory.h index 520e779..aad95d1 100644 --- a/sync/internal_api/public/internal_components_factory.h +++ b/sync/internal_api/public/internal_components_factory.h @@ -12,7 +12,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "sync/base/sync_export.h" #include "sync/internal_api/public/engine/model_safe_worker.h" diff --git a/sync/internal_api/public/sync_manager.h b/sync/internal_api/public/sync_manager.h index 7cf57f9..6e23ba8 100644 --- a/sync/internal_api/public/sync_manager.h +++ b/sync/internal_api/public/sync_manager.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/task_runner.h" #include "base/threading/thread_checker.h" diff --git a/sync/syncable/directory_backing_store_unittest.cc b/sync/syncable/directory_backing_store_unittest.cc index 3fa9edd..a9da2ca0 100644 --- a/sync/syncable/directory_backing_store_unittest.cc +++ b/sync/syncable/directory_backing_store_unittest.cc @@ -6,8 +6,8 @@ #include <string> -#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/memory/scoped_ptr.h" #include "base/stl_util.h" diff --git a/sync/syncable/on_disk_directory_backing_store.h b/sync/syncable/on_disk_directory_backing_store.h index bcb62c2..83c6225 100644 --- a/sync/syncable/on_disk_directory_backing_store.h +++ b/sync/syncable/on_disk_directory_backing_store.h @@ -5,7 +5,7 @@ #ifndef SYNC_SYNCABLE_ON_DISK_DIRECTORY_BACKING_STORE_H_ #define SYNC_SYNCABLE_ON_DISK_DIRECTORY_BACKING_STORE_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "sync/base/sync_export.h" #include "sync/syncable/directory_backing_store.h" diff --git a/sync/syncable/syncable_unittest.cc b/sync/syncable/syncable_unittest.cc index b162934..b4772b9 100644 --- a/sync/syncable/syncable_unittest.cc +++ b/sync/syncable/syncable_unittest.cc @@ -6,8 +6,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.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/location.h" #include "base/logging.h" diff --git a/sync/tools/testserver/run_sync_testserver.cc b/sync/tools/testserver/run_sync_testserver.cc index 9295034..00910fc 100644 --- a/sync/tools/testserver/run_sync_testserver.cc +++ b/sync/tools/testserver/run_sync_testserver.cc @@ -6,7 +6,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/message_loop.h" #include "base/process_util.h" diff --git a/testing/android/native_test_launcher.cc b/testing/android/native_test_launcher.cc index a16b536..57a918b 100644 --- a/testing/android/native_test_launcher.cc +++ b/testing/android/native_test_launcher.cc @@ -19,7 +19,7 @@ #include "base/at_exit.h" #include "base/base_switches.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 "gtest/gtest.h" diff --git a/testing/android/native_test_util.cc b/testing/android/native_test_util.cc index 08f901b..98acbae 100644 --- a/testing/android/native_test_util.cc +++ b/testing/android/native_test_util.cc @@ -7,13 +7,13 @@ #include <android/log.h> #include <stdarg.h> #include <stdio.h> -#include <sys/types.h> #include <sys/stat.h> +#include <sys/types.h> #include <unistd.h> #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "base/strings/string_tokenizer.h" diff --git a/third_party/leveldatabase/env_chromium.cc b/third_party/leveldatabase/env_chromium.cc index 7651c9c..45242ac 100644 --- a/third_party/leveldatabase/env_chromium.cc +++ b/third_party/leveldatabase/env_chromium.cc @@ -2,12 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include <deque> #include <errno.h> #include <stdio.h> + +#include <deque> + #include "base/at_exit.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" diff --git a/third_party/widevine/cdm/widevine_cdm_common.h b/third_party/widevine/cdm/widevine_cdm_common.h index 8f13bc1..e782c3b 100644 --- a/third_party/widevine/cdm/widevine_cdm_common.h +++ b/third_party/widevine/cdm/widevine_cdm_common.h @@ -5,7 +5,7 @@ #ifndef WIDEVINE_CDM_COMMON_H_INCLUDED_ #define WIDEVINE_CDM_COMMON_H_INCLUDED_ -#include "base/file_path.h" +#include "base/files/file_path.h" // This file defines constants common to all Widevine CDM versions. diff --git a/tools/android/forwarder2/daemon.cc b/tools/android/forwarder2/daemon.cc index f45dc1d..286496c 100644 --- a/tools/android/forwarder2/daemon.cc +++ b/tools/android/forwarder2/daemon.cc @@ -18,8 +18,8 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/posix/eintr_wrapper.h" diff --git a/tools/android/forwarder2/host_forwarder_main.cc b/tools/android/forwarder2/host_forwarder_main.cc index 435cae4..b1b8ce1 100644 --- a/tools/android/forwarder2/host_forwarder_main.cc +++ b/tools/android/forwarder2/host_forwarder_main.cc @@ -13,8 +13,8 @@ #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_vector.h" #include "base/posix/eintr_wrapper.h" diff --git a/tools/android/md5sum/md5sum.cc b/tools/android/md5sum/md5sum.cc index 0730133..a044f0e 100644 --- a/tools/android/md5sum/md5sum.cc +++ b/tools/android/md5sum/md5sum.cc @@ -10,8 +10,8 @@ #include <set> #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/md5.h" diff --git a/tools/imagediff/image_diff.cc b/tools/imagediff/image_diff.cc index 9467340..5ef9408 100644 --- a/tools/imagediff/image_diff.cc +++ b/tools/imagediff/image_diff.cc @@ -9,14 +9,14 @@ // what the run-webkit-tests script expects. #include <algorithm> -#include <vector> -#include <string> #include <iostream> +#include <string> +#include <vector> #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/process_util.h" diff --git a/ui/aura/test/test_suite.cc b/ui/aura/test/test_suite.cc index f74757d..e487c9b 100644 --- a/ui/aura/test/test_suite.cc +++ b/ui/aura/test/test_suite.cc @@ -4,7 +4,7 @@ #include "ui/aura/test/test_suite.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "build/build_config.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ui/base/clipboard/clipboard_aurax11.cc b/ui/base/clipboard/clipboard_aurax11.cc index 7ae536c..44cbe42 100644 --- a/ui/base/clipboard/clipboard_aurax11.cc +++ b/ui/base/clipboard/clipboard_aurax11.cc @@ -10,7 +10,7 @@ #include <set> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/icu_string_conversions.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/ui/base/clipboard/clipboard_chromeos.cc b/ui/base/clipboard/clipboard_chromeos.cc index 6bce457..86cffb7 100644 --- a/ui/base/clipboard/clipboard_chromeos.cc +++ b/ui/base/clipboard/clipboard_chromeos.cc @@ -7,7 +7,7 @@ #include <list> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" diff --git a/ui/base/clipboard/clipboard_gtk.cc b/ui/base/clipboard/clipboard_gtk.cc index 774393f..5642653 100644 --- a/ui/base/clipboard/clipboard_gtk.cc +++ b/ui/base/clipboard/clipboard_gtk.cc @@ -13,7 +13,7 @@ #include <utility> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/singleton.h" #include "base/utf_string_conversions.h" diff --git a/ui/base/clipboard/clipboard_mac.mm b/ui/base/clipboard/clipboard_mac.mm index a6d92e5..89febe7 100644 --- a/ui/base/clipboard/clipboard_mac.mm +++ b/ui/base/clipboard/clipboard_mac.mm @@ -7,7 +7,7 @@ #import <Cocoa/Cocoa.h> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc index ce1bf0f..238e047 100644 --- a/ui/base/clipboard/clipboard_win.cc +++ b/ui/base/clipboard/clipboard_win.cc @@ -11,7 +11,7 @@ #include <shellapi.h> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/safe_numerics.h" diff --git a/ui/base/dragdrop/drag_utils.h b/ui/base/dragdrop/drag_utils.h index 418dc7a..d31c628 100644 --- a/ui/base/dragdrop/drag_utils.h +++ b/ui/base/dragdrop/drag_utils.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "ui/base/ui_export.h" class GURL; diff --git a/ui/base/dragdrop/os_exchange_data.h b/ui/base/dragdrop/os_exchange_data.h index 110d127..f55dd2d 100644 --- a/ui/base/dragdrop/os_exchange_data.h +++ b/ui/base/dragdrop/os_exchange_data.h @@ -17,7 +17,7 @@ #endif #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "ui/base/dragdrop/download_file_interface.h" #include "ui/base/ui_export.h" diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.h b/ui/base/dragdrop/os_exchange_data_provider_aura.h index f577653..90cc1ae 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_aura.h +++ b/ui/base/dragdrop/os_exchange_data_provider_aura.h @@ -7,7 +7,7 @@ #include <map> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/pickle.h" #include "googleurl/src/gurl.h" #include "ui/base/dragdrop/os_exchange_data.h" diff --git a/ui/base/dragdrop/os_exchange_data_provider_gtk.cc b/ui/base/dragdrop/os_exchange_data_provider_gtk.cc index 5abbed2..09bd9cd 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_gtk.cc +++ b/ui/base/dragdrop/os_exchange_data_provider_gtk.cc @@ -6,7 +6,7 @@ #include <algorithm> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "net/base/net_util.h" #include "ui/base/dragdrop/gtk_dnd_util.h" diff --git a/ui/base/dragdrop/os_exchange_data_provider_gtk.h b/ui/base/dragdrop/os_exchange_data_provider_gtk.h index 0e316fa..1856053 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_gtk.h +++ b/ui/base/dragdrop/os_exchange_data_provider_gtk.h @@ -11,7 +11,7 @@ #include <string> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/pickle.h" #include "base/string16.h" #include "googleurl/src/gurl.h" diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc index 02f87d3..1528083 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_win.cc +++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc @@ -7,7 +7,7 @@ #include <algorithm> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/file_util_icu.h" #include "base/logging.h" #include "base/memory/scoped_handle.h" diff --git a/ui/base/resource/data_pack_unittest.cc b/ui/base/resource/data_pack_unittest.cc index 3258170..8804350 100644 --- a/ui/base/resource/data_pack_unittest.cc +++ b/ui/base/resource/data_pack_unittest.cc @@ -2,8 +2,8 @@ // 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/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/string_piece.h" diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h index b7613ae..2fa6bf0 100644 --- a/ui/base/resource/resource_bundle.h +++ b/ui/base/resource/resource_bundle.h @@ -11,7 +11,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" diff --git a/ui/base/resource/resource_bundle_android.cc b/ui/base/resource/resource_bundle_android.cc index 3e1e8aa..6e858ec 100644 --- a/ui/base/resource/resource_bundle_android.cc +++ b/ui/base/resource/resource_bundle_android.cc @@ -6,13 +6,13 @@ #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/stringprintf.h" -#include "ui/base/ui_base_paths.h" #include "ui/base/resource/resource_handle.h" +#include "ui/base/ui_base_paths.h" namespace ui { diff --git a/ui/base/resource/resource_bundle_ios.mm b/ui/base/resource/resource_bundle_ios.mm index 925e702..b23e5d7 100644 --- a/ui/base/resource/resource_bundle_ios.mm +++ b/ui/base/resource/resource_bundle_ios.mm @@ -8,8 +8,8 @@ #import <UIKit/UIKit.h> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/mac/bundle_locations.h" #include "base/mac/foundation_util.h" #include "base/memory/ref_counted_memory.h" diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm index 39c52d9..8e66011 100644 --- a/ui/base/resource/resource_bundle_mac.mm +++ b/ui/base/resource/resource_bundle_mac.mm @@ -7,8 +7,8 @@ #import <AppKit/AppKit.h> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #include "base/memory/ref_counted_memory.h" diff --git a/ui/base/resource/resource_bundle_unittest.cc b/ui/base/resource/resource_bundle_unittest.cc index 70dd8c1..ab1c2094 100644 --- a/ui/base/resource/resource_bundle_unittest.cc +++ b/ui/base/resource/resource_bundle_unittest.cc @@ -5,8 +5,8 @@ #include "ui/base/resource/resource_bundle.h" #include "base/base_paths.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/logging.h" #include "base/memory/ref_counted_memory.h" diff --git a/ui/base/text/text_elider.cc b/ui/base/text/text_elider.cc index fa466da..5479f57 100644 --- a/ui/base/text/text_elider.cc +++ b/ui/base/text/text_elider.cc @@ -12,7 +12,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/break_iterator.h" #include "base/i18n/char_iterator.h" #include "base/i18n/rtl.h" diff --git a/ui/base/text/text_elider_unittest.cc b/ui/base/text/text_elider_unittest.cc index cbf895f..b95a8d6 100644 --- a/ui/base/text/text_elider_unittest.cc +++ b/ui/base/text/text_elider_unittest.cc @@ -6,7 +6,7 @@ #include "ui/base/text/text_elider.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/rtl.h" #include "base/memory/scoped_ptr.h" #include "base/string_util.h" diff --git a/ui/base/ui_base_paths.cc b/ui/base/ui_base_paths.cc index 6384c97..98642b4 100644 --- a/ui/base/ui_base_paths.cc +++ b/ui/base/ui_base_paths.cc @@ -5,8 +5,8 @@ #include "ui/base/ui_base_paths.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" diff --git a/ui/base/win/shell.cc b/ui/base/win/shell.cc index 7409fad..dcc50ec 100644 --- a/ui/base/win/shell.cc +++ b/ui/base/win/shell.cc @@ -5,11 +5,11 @@ #include "ui/base/win/shell.h" #include <dwmapi.h> -#include <shellapi.h> #include <shlobj.h> // Must be before propkey. #include <propkey.h> +#include <shellapi.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/native_library.h" #include "base/string_util.h" #include "base/win/metro.h" diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc index 1e75c71..54fdea7 100644 --- a/ui/compositor/layer_unittest.cc +++ b/ui/compositor/layer_unittest.cc @@ -4,8 +4,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/string_util.h" diff --git a/ui/gfx/gfx_paths.cc b/ui/gfx/gfx_paths.cc index 5c65674..e78e72a 100644 --- a/ui/gfx/gfx_paths.cc +++ b/ui/gfx/gfx_paths.cc @@ -5,8 +5,8 @@ #include "ui/gfx/gfx_paths.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" namespace gfx { diff --git a/ui/gfx/video_decode_acceleration_support_mac.mm b/ui/gfx/video_decode_acceleration_support_mac.mm index d4d19ff..4cc2045 100644 --- a/ui/gfx/video_decode_acceleration_support_mac.mm +++ b/ui/gfx/video_decode_acceleration_support_mac.mm @@ -7,9 +7,9 @@ #include <dlfcn.h> #include "base/bind.h" -#include "base/file_path.h" -#import "base/mac/foundation_util.h" +#include "base/files/file_path.h" #include "base/location.h" +#import "base/mac/foundation_util.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "base/native_library.h" diff --git a/ui/gl/gl_implementation_android.cc b/ui/gl/gl_implementation_android.cc index 2b562a8..d948c578 100644 --- a/ui/gl/gl_implementation_android.cc +++ b/ui/gl/gl_implementation_android.cc @@ -4,7 +4,7 @@ #include "base/base_paths.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/native_library.h" #include "base/path_service.h" diff --git a/ui/gl/gl_implementation_linux.cc b/ui/gl/gl_implementation_linux.cc index 42f2d5c..2da8254 100644 --- a/ui/gl/gl_implementation_linux.cc +++ b/ui/gl/gl_implementation_linux.cc @@ -6,7 +6,7 @@ #include "base/base_paths.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/native_library.h" #include "base/path_service.h" diff --git a/ui/gl/gl_implementation_mac.cc b/ui/gl/gl_implementation_mac.cc index 590a14b..09af157 100644 --- a/ui/gl/gl_implementation_mac.cc +++ b/ui/gl/gl_implementation_mac.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/base_paths.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/mac/foundation_util.h" #include "base/native_library.h" diff --git a/ui/gl/gl_implementation_win.cc b/ui/gl/gl_implementation_win.cc index 22fcd77..f0c5626 100644 --- a/ui/gl/gl_implementation_win.cc +++ b/ui/gl/gl_implementation_win.cc @@ -8,7 +8,7 @@ #include "base/base_paths.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/native_library.h" #include "base/path_service.h" diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_file_dialog.h index 94e6ff8..6a3515b 100644 --- a/ui/shell_dialogs/select_file_dialog.h +++ b/ui/shell_dialogs/select_file_dialog.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/callback_forward.h" -#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/string16.h" diff --git a/ui/shell_dialogs/select_file_dialog_android.h b/ui/shell_dialogs/select_file_dialog_android.h index 1fb89af..e31d3b3 100644 --- a/ui/shell_dialogs/select_file_dialog_android.h +++ b/ui/shell_dialogs/select_file_dialog_android.h @@ -8,7 +8,7 @@ #include <jni.h> #include "base/android/scoped_java_ref.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "ui/shell_dialogs/select_file_dialog.h" namespace ui { diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/select_file_dialog_win.cc index 44c24cd..940eb512 100644 --- a/ui/shell_dialogs/select_file_dialog_win.cc +++ b/ui/shell_dialogs/select_file_dialog_win.cc @@ -12,8 +12,8 @@ #include <set> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/i18n/case_conversion.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" diff --git a/ui/shell_dialogs/selected_file_info.h b/ui/shell_dialogs/selected_file_info.h index 57228ed..fc8e1bd 100644 --- a/ui/shell_dialogs/selected_file_info.h +++ b/ui/shell_dialogs/selected_file_info.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "ui/shell_dialogs/shell_dialogs_export.h" diff --git a/ui/surface/accelerated_surface_win.cc b/ui/surface/accelerated_surface_win.cc index 7ebde54..4521647 100644 --- a/ui/surface/accelerated_surface_win.cc +++ b/ui/surface/accelerated_surface_win.cc @@ -12,7 +12,7 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/debug/trace_event.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop_proxy.h" diff --git a/ui/surface/d3d9_utils_win.cc b/ui/surface/d3d9_utils_win.cc index 4377362..b4d210b 100644 --- a/ui/surface/d3d9_utils_win.cc +++ b/ui/surface/d3d9_utils_win.cc @@ -4,7 +4,7 @@ #include "ui/surface/d3d9_utils_win.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/scoped_native_library.h" #include "base/win/scoped_comptr.h" #include "ui/gfx/size.h" diff --git a/ui/test/test_suite.cc b/ui/test/test_suite.cc index 47fc790..13890e2 100644 --- a/ui/test/test_suite.cc +++ b/ui/test/test_suite.cc @@ -4,7 +4,7 @@ #include "ui/test/test_suite.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "build/build_config.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ui/views/examples/content_client/examples_main_delegate.cc b/ui/views/examples/content_client/examples_main_delegate.cc index 1883ed0..0d17249 100644 --- a/ui/views/examples/content_client/examples_main_delegate.cc +++ b/ui/views/examples/content_client/examples_main_delegate.cc @@ -7,7 +7,7 @@ #include <string> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "content/public/common/content_switches.h" diff --git a/webkit/appcache/appcache_database.h b/webkit/appcache/appcache_database.h index b110ba1..0eb0948 100644 --- a/webkit/appcache/appcache_database.h +++ b/webkit/appcache/appcache_database.h @@ -10,7 +10,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" diff --git a/webkit/appcache/appcache_disk_cache.cc b/webkit/appcache/appcache_disk_cache.cc index 025c9b5..33edef3 100644 --- a/webkit/appcache/appcache_disk_cache.cc +++ b/webkit/appcache/appcache_disk_cache.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/stl_util.h" #include "base/string_number_conversions.h" diff --git a/webkit/appcache/appcache_interfaces.h b/webkit/appcache/appcache_interfaces.h index bae673b..4fc7a56 100644 --- a/webkit/appcache/appcache_interfaces.h +++ b/webkit/appcache/appcache_interfaces.h @@ -8,7 +8,7 @@ #include <string> #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/time.h" #include "googleurl/src/gurl.h" #include "webkit/storage/webkit_storage_export.h" diff --git a/webkit/appcache/appcache_storage_impl.h b/webkit/appcache/appcache_storage_impl.h index 4211e62..28fd08b 100644 --- a/webkit/appcache/appcache_storage_impl.h +++ b/webkit/appcache/appcache_storage_impl.h @@ -12,7 +12,7 @@ #include <vector> #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/message_loop_proxy.h" #include "webkit/appcache/appcache_database.h" diff --git a/webkit/base/data_element.h b/webkit/base/data_element.h index 3e286ba..c75242b 100644 --- a/webkit/base/data_element.h +++ b/webkit/base/data_element.h @@ -8,7 +8,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/time.h" #include "googleurl/src/gurl.h" diff --git a/webkit/base/file_path_string_conversions.h b/webkit/base/file_path_string_conversions.h index 951c466..8fe6674 100644 --- a/webkit/base/file_path_string_conversions.h +++ b/webkit/base/file_path_string_conversions.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_BASE_FILE_PATH_STRING_CONVERSIONS_H_ #define WEBKIT_BASE_FILE_PATH_STRING_CONVERSIONS_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "webkit/base/webkit_base_export.h" namespace WebKit { diff --git a/webkit/blob/blob_data.h b/webkit/blob/blob_data.h index 08c47f4..cf29f3c 100644 --- a/webkit/blob/blob_data.h +++ b/webkit/blob/blob_data.h @@ -8,7 +8,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/time.h" #include "googleurl/src/gurl.h" diff --git a/webkit/blob/blob_storage_controller_unittest.cc b/webkit/blob/blob_storage_controller_unittest.cc index 9290f6a..f2d23a4 100644 --- a/webkit/blob/blob_storage_controller_unittest.cc +++ b/webkit/blob/blob_storage_controller_unittest.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/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc index da20cd9..b6f66db 100644 --- a/webkit/blob/blob_url_request_job_unittest.cc +++ b/webkit/blob/blob_url_request_job_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/bind.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/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/webkit/blob/local_file_stream_reader.h b/webkit/blob/local_file_stream_reader.h index de1f64e..d5117a6 100644 --- a/webkit/blob/local_file_stream_reader.h +++ b/webkit/blob/local_file_stream_reader.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/platform_file.h" #include "base/time.h" diff --git a/webkit/blob/local_file_stream_reader_unittest.cc b/webkit/blob/local_file_stream_reader_unittest.cc index fa959b3..4726e33 100644 --- a/webkit/blob/local_file_stream_reader_unittest.cc +++ b/webkit/blob/local_file_stream_reader_unittest.cc @@ -6,8 +6,8 @@ #include <string> -#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/memory/scoped_ptr.h" #include "base/message_loop.h" diff --git a/webkit/blob/shareable_file_reference.h b/webkit/blob/shareable_file_reference.h index 5323cfa..1eaff08 100644 --- a/webkit/blob/shareable_file_reference.h +++ b/webkit/blob/shareable_file_reference.h @@ -8,7 +8,7 @@ #include <vector> #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "webkit/storage/webkit_storage_export.h" diff --git a/webkit/chromeos/fileapi/cros_mount_point_provider.h b/webkit/chromeos/fileapi/cros_mount_point_provider.h index dda8dd3..21cb7cc 100644 --- a/webkit/chromeos/fileapi/cros_mount_point_provider.h +++ b/webkit/chromeos/fileapi/cros_mount_point_provider.h @@ -10,7 +10,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "webkit/fileapi/file_system_mount_point_provider.h" diff --git a/webkit/chromeos/fileapi/cros_mount_point_provider_unittest.cc b/webkit/chromeos/fileapi/cros_mount_point_provider_unittest.cc index 6fb99f1..1910ee3 100644 --- a/webkit/chromeos/fileapi/cros_mount_point_provider_unittest.cc +++ b/webkit/chromeos/fileapi/cros_mount_point_provider_unittest.cc @@ -6,7 +6,7 @@ #include <set> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "googleurl/src/url_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/fileapi/external_mount_points.h" diff --git a/webkit/chromeos/fileapi/file_access_permissions.h b/webkit/chromeos/fileapi/file_access_permissions.h index f62b837..5b6d010 100644 --- a/webkit/chromeos/fileapi/file_access_permissions.h +++ b/webkit/chromeos/fileapi/file_access_permissions.h @@ -9,7 +9,7 @@ #include <set> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/synchronization/lock.h" namespace chromeos { diff --git a/webkit/chromeos/fileapi/remote_file_stream_writer.h b/webkit/chromeos/fileapi/remote_file_stream_writer.h index c68e9db..49a2360 100644 --- a/webkit/chromeos/fileapi/remote_file_stream_writer.h +++ b/webkit/chromeos/fileapi/remote_file_stream_writer.h @@ -6,10 +6,10 @@ #define WEBKIT_CHROMEOS_FILEAPI_REMOTE_FILE_STREAM_WRITER_H_ #include "base/basictypes.h" -#include "base/file_path.h" -#include "base/platform_file.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/platform_file.h" #include "webkit/fileapi/file_stream_writer.h" #include "webkit/fileapi/file_system_url.h" diff --git a/webkit/database/database_quota_client_unittest.cc b/webkit/database/database_quota_client_unittest.cc index 541f1e0..631c20b 100644 --- a/webkit/database/database_quota_client_unittest.cc +++ b/webkit/database/database_quota_client_unittest.cc @@ -5,7 +5,7 @@ #include <map> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/utf_string_conversions.h" diff --git a/webkit/database/database_tracker.h b/webkit/database/database_tracker.h index 956a72e..e11a8fe 100644 --- a/webkit/database/database_tracker.h +++ b/webkit/database/database_tracker.h @@ -9,7 +9,7 @@ #include <set> #include <utility> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/webkit/database/database_tracker_unittest.cc b/webkit/database/database_tracker_unittest.cc index 3a16141..193d3d7 100644 --- a/webkit/database/database_tracker_unittest.cc +++ b/webkit/database/database_tracker_unittest.cc @@ -2,8 +2,8 @@ // 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/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" diff --git a/webkit/database/vfs_backend.cc b/webkit/database/vfs_backend.cc index 8d046e2..c1e2357 100644 --- a/webkit/database/vfs_backend.cc +++ b/webkit/database/vfs_backend.cc @@ -4,8 +4,8 @@ #include "webkit/database/vfs_backend.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "third_party/sqlite/sqlite3.h" diff --git a/webkit/dom_storage/dom_storage_area.h b/webkit/dom_storage/dom_storage_area.h index d9fbcae..d804b41 100644 --- a/webkit/dom_storage/dom_storage_area.h +++ b/webkit/dom_storage/dom_storage_area.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_DOM_STORAGE_DOM_STORAGE_AREA_H_ #define WEBKIT_DOM_STORAGE_DOM_STORAGE_AREA_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/webkit/dom_storage/dom_storage_context.h b/webkit/dom_storage/dom_storage_context.h index 76a92b0..20ae0ed 100644 --- a/webkit/dom_storage/dom_storage_context.h +++ b/webkit/dom_storage/dom_storage_context.h @@ -11,7 +11,7 @@ #include "base/atomic_sequence_num.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" diff --git a/webkit/dom_storage/dom_storage_database.h b/webkit/dom_storage/dom_storage_database.h index e11a507..e7644f2 100644 --- a/webkit/dom_storage/dom_storage_database.h +++ b/webkit/dom_storage/dom_storage_database.h @@ -7,7 +7,7 @@ #include <map> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/nullable_string16.h" diff --git a/webkit/dom_storage/dom_storage_database_unittest.cc b/webkit/dom_storage/dom_storage_database_unittest.cc index 79f8afbf..7e50cc7 100644 --- a/webkit/dom_storage/dom_storage_database_unittest.cc +++ b/webkit/dom_storage/dom_storage_database_unittest.cc @@ -4,8 +4,8 @@ #include "webkit/dom_storage/dom_storage_database.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/path_service.h" #include "base/utf_string_conversions.h" diff --git a/webkit/dom_storage/dom_storage_namespace.h b/webkit/dom_storage/dom_storage_namespace.h index 00439c0..78ef4d7 100644 --- a/webkit/dom_storage/dom_storage_namespace.h +++ b/webkit/dom_storage/dom_storage_namespace.h @@ -8,7 +8,7 @@ #include <map> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "webkit/storage/webkit_storage_export.h" diff --git a/webkit/dom_storage/session_storage_database.h b/webkit/dom_storage/session_storage_database.h index 44ecb97..9cc9b2b 100644 --- a/webkit/dom_storage/session_storage_database.h +++ b/webkit/dom_storage/session_storage_database.h @@ -8,7 +8,7 @@ #include <map> #include <string> -#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/synchronization/lock.h" diff --git a/webkit/fileapi/external_mount_points.cc b/webkit/fileapi/external_mount_points.cc index b129911..5c84c1b 100644 --- a/webkit/fileapi/external_mount_points.cc +++ b/webkit/fileapi/external_mount_points.cc @@ -4,7 +4,7 @@ #include "webkit/fileapi/external_mount_points.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/path_service.h" #include "base/stl_util.h" diff --git a/webkit/fileapi/external_mount_points_unittest.cc b/webkit/fileapi/external_mount_points_unittest.cc index c8edbdd..4b2ce6cb 100644 --- a/webkit/fileapi/external_mount_points_unittest.cc +++ b/webkit/fileapi/external_mount_points_unittest.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/fileapi/file_system_url.h" diff --git a/webkit/fileapi/file_system_dir_url_request_job.h b/webkit/fileapi/file_system_dir_url_request_job.h index 75539f8..7a671e8f 100644 --- a/webkit/fileapi/file_system_dir_url_request_job.h +++ b/webkit/fileapi/file_system_dir_url_request_job.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/file_util_proxy.h" #include "base/memory/weak_ptr.h" #include "base/message_loop_proxy.h" diff --git a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc index b825c61..19aa253 100644 --- a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc +++ b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/format_macros.h" #include "base/memory/weak_ptr.h" diff --git a/webkit/fileapi/file_system_directory_database.h b/webkit/fileapi/file_system_directory_database.h index 5ab9ec1..e157b65 100644 --- a/webkit/fileapi/file_system_directory_database.h +++ b/webkit/fileapi/file_system_directory_database.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" #include "webkit/storage/webkit_storage_export.h" diff --git a/webkit/fileapi/file_system_file_util.h b/webkit/fileapi/file_system_file_util.h index e4e94be..46f54cd 100644 --- a/webkit/fileapi/file_system_file_util.h +++ b/webkit/fileapi/file_system_file_util.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_FILEAPI_FILE_SYSTEM_FILE_UTIL_H_ #define WEBKIT_FILEAPI_FILE_SYSTEM_FILE_UTIL_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" #include "webkit/fileapi/file_snapshot_policy.h" diff --git a/webkit/fileapi/file_system_mount_point_provider.h b/webkit/fileapi/file_system_mount_point_provider.h index 6bc8300..976d4605 100644 --- a/webkit/fileapi/file_system_mount_point_provider.h +++ b/webkit/fileapi/file_system_mount_point_provider.h @@ -9,7 +9,7 @@ #include <vector> #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/platform_file.h" #include "webkit/fileapi/file_permission_policy.h" #include "webkit/fileapi/file_system_types.h" diff --git a/webkit/fileapi/file_system_origin_database.h b/webkit/fileapi/file_system_origin_database.h index 98eb212..45bcb26 100644 --- a/webkit/fileapi/file_system_origin_database.h +++ b/webkit/fileapi/file_system_origin_database.h @@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" #include "webkit/storage/webkit_storage_export.h" diff --git a/webkit/fileapi/file_system_origin_database_unittest.cc b/webkit/fileapi/file_system_origin_database_unittest.cc index e3cc8fb..294560d 100644 --- a/webkit/fileapi/file_system_origin_database_unittest.cc +++ b/webkit/fileapi/file_system_origin_database_unittest.cc @@ -7,8 +7,8 @@ #include <limits> #include <string> -#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/platform_file.h" #include "base/stl_util.h" diff --git a/webkit/fileapi/file_system_quota_client.cc b/webkit/fileapi/file_system_quota_client.cc index 6ed489a..8f38b17 100644 --- a/webkit/fileapi/file_system_quota_client.cc +++ b/webkit/fileapi/file_system_quota_client.cc @@ -8,8 +8,8 @@ #include <set> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/webkit/fileapi/file_system_quota_client.h b/webkit/fileapi/file_system_quota_client.h index af36acc..40f5221 100644 --- a/webkit/fileapi/file_system_quota_client.h +++ b/webkit/fileapi/file_system_quota_client.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "webkit/fileapi/file_system_quota_util.h" #include "webkit/fileapi/file_system_types.h" diff --git a/webkit/fileapi/file_system_url_request_job.cc b/webkit/fileapi/file_system_url_request_job.cc index 4db776a..afa6e37 100644 --- a/webkit/fileapi/file_system_url_request_job.cc +++ b/webkit/fileapi/file_system_url_request_job.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/file_util_proxy.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" diff --git a/webkit/fileapi/file_system_url_request_job_unittest.cc b/webkit/fileapi/file_system_url_request_job_unittest.cc index b142d6c..8d8bd7e 100644 --- a/webkit/fileapi/file_system_url_request_job_unittest.cc +++ b/webkit/fileapi/file_system_url_request_job_unittest.cc @@ -7,8 +7,8 @@ #include <string> #include "base/bind.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/format_macros.h" #include "base/memory/weak_ptr.h" diff --git a/webkit/fileapi/file_system_url_unittest.cc b/webkit/fileapi/file_system_url_unittest.cc index e3fa393..06d3dbd 100644 --- a/webkit/fileapi/file_system_url_unittest.cc +++ b/webkit/fileapi/file_system_url_unittest.cc @@ -4,7 +4,7 @@ #include "webkit/fileapi/file_system_url.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/fileapi/external_mount_points.h" diff --git a/webkit/fileapi/file_system_usage_cache.cc b/webkit/fileapi/file_system_usage_cache.cc index fedb79e..ec666dd 100644 --- a/webkit/fileapi/file_system_usage_cache.cc +++ b/webkit/fileapi/file_system_usage_cache.cc @@ -4,8 +4,8 @@ #include "webkit/fileapi/file_system_usage_cache.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/pickle.h" namespace fileapi { diff --git a/webkit/fileapi/file_system_usage_cache.h b/webkit/fileapi/file_system_usage_cache.h index 428aa4b..bd35584 100644 --- a/webkit/fileapi/file_system_usage_cache.h +++ b/webkit/fileapi/file_system_usage_cache.h @@ -6,7 +6,7 @@ #define WEBKIT_FILEAPI_FILE_SYSTEM_USAGE_CACHE_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "webkit/storage/webkit_storage_export.h" namespace fileapi { diff --git a/webkit/fileapi/file_system_util.cc b/webkit/fileapi/file_system_util.cc index 82aa01e..63b0b1b 100644 --- a/webkit/fileapi/file_system_util.cc +++ b/webkit/fileapi/file_system_util.cc @@ -6,7 +6,7 @@ #include "build/build_config.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" diff --git a/webkit/fileapi/file_system_util.h b/webkit/fileapi/file_system_util.h index 89ee3c36..0381383 100644 --- a/webkit/fileapi/file_system_util.h +++ b/webkit/fileapi/file_system_util.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/platform_file.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileError.h" #include "webkit/fileapi/file_system_types.h" diff --git a/webkit/fileapi/file_system_util_unittest.cc b/webkit/fileapi/file_system_util_unittest.cc index 04c0f1d..d1ea9cc 100644 --- a/webkit/fileapi/file_system_util_unittest.cc +++ b/webkit/fileapi/file_system_util_unittest.cc @@ -4,7 +4,7 @@ #include "webkit/fileapi/file_system_util.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/fileapi/file_system_types.h" diff --git a/webkit/fileapi/file_writer_delegate.h b/webkit/fileapi/file_writer_delegate.h index 2e78cc6..351db62 100644 --- a/webkit/fileapi/file_writer_delegate.h +++ b/webkit/fileapi/file_writer_delegate.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_FILEAPI_FILE_WRITER_DELEGATE_H_ #define WEBKIT_FILEAPI_FILE_WRITER_DELEGATE_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/platform_file.h" diff --git a/webkit/fileapi/isolated_context.cc b/webkit/fileapi/isolated_context.cc index 12232ce..56ba1c0 100644 --- a/webkit/fileapi/isolated_context.cc +++ b/webkit/fileapi/isolated_context.cc @@ -4,8 +4,8 @@ #include "webkit/fileapi/isolated_context.h" -#include "base/file_path.h" #include "base/basictypes.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/rand_util.h" #include "base/stl_util.h" diff --git a/webkit/fileapi/isolated_context.h b/webkit/fileapi/isolated_context.h index faf034c..313ccc6 100644 --- a/webkit/fileapi/isolated_context.h +++ b/webkit/fileapi/isolated_context.h @@ -11,7 +11,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/memory/singleton.h" #include "base/synchronization/lock.h" diff --git a/webkit/fileapi/isolated_mount_point_provider.cc b/webkit/fileapi/isolated_mount_point_provider.cc index 285aa79..6d3e438 100644 --- a/webkit/fileapi/isolated_mount_point_provider.cc +++ b/webkit/fileapi/isolated_mount_point_provider.cc @@ -7,7 +7,7 @@ #include <string> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" diff --git a/webkit/fileapi/local_file_stream_writer.h b/webkit/fileapi/local_file_stream_writer.h index a6d15f9..b12c8ed 100644 --- a/webkit/fileapi/local_file_stream_writer.h +++ b/webkit/fileapi/local_file_stream_writer.h @@ -9,7 +9,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/platform_file.h" diff --git a/webkit/fileapi/local_file_system_test_helper.h b/webkit/fileapi/local_file_system_test_helper.h index f3f20f3..c2dae33 100644 --- a/webkit/fileapi/local_file_system_test_helper.h +++ b/webkit/fileapi/local_file_system_test_helper.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "googleurl/src/gurl.h" #include "webkit/fileapi/file_system_types.h" diff --git a/webkit/fileapi/local_file_util_unittest.cc b/webkit/fileapi/local_file_util_unittest.cc index 7582687..f9e3d7d 100644 --- a/webkit/fileapi/local_file_util_unittest.cc +++ b/webkit/fileapi/local_file_util_unittest.cc @@ -4,7 +4,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" diff --git a/webkit/fileapi/media/device_media_async_file_util.h b/webkit/fileapi/media/device_media_async_file_util.h index aa4b1fe..2b04329 100644 --- a/webkit/fileapi/media/device_media_async_file_util.h +++ b/webkit/fileapi/media/device_media_async_file_util.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_FILEAPI_MEDIA_DEVICE_MEDIA_ASYNC_FILE_UTIL_H_ #define WEBKIT_FILEAPI_MEDIA_DEVICE_MEDIA_ASYNC_FILE_UTIL_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/platform_file.h" #include "webkit/fileapi/async_file_util.h" diff --git a/webkit/fileapi/media/device_media_file_util.h b/webkit/fileapi/media/device_media_file_util.h index efe85c7..f142573 100644 --- a/webkit/fileapi/media/device_media_file_util.h +++ b/webkit/fileapi/media/device_media_file_util.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_FILEAPI_MEDIA_DEVICE_MEDIA_FILE_UTIL_H_ #define WEBKIT_FILEAPI_MEDIA_DEVICE_MEDIA_FILE_UTIL_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" #include "webkit/fileapi/file_system_file_util.h" diff --git a/webkit/fileapi/media/filtering_file_enumerator.cc b/webkit/fileapi/media/filtering_file_enumerator.cc index 393cfa2..16ee725 100644 --- a/webkit/fileapi/media/filtering_file_enumerator.cc +++ b/webkit/fileapi/media/filtering_file_enumerator.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/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "build/build_config.h" #include "webkit/fileapi/media/filtering_file_enumerator.h" diff --git a/webkit/fileapi/media/media_path_filter.h b/webkit/fileapi/media/media_path_filter.h index 694be4e..c36a4fb 100644 --- a/webkit/fileapi/media/media_path_filter.h +++ b/webkit/fileapi/media/media_path_filter.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/synchronization/lock.h" #include "webkit/storage/webkit_storage_export.h" diff --git a/webkit/fileapi/media/mtp_device_map_service.h b/webkit/fileapi/media/mtp_device_map_service.h index e5da5d8..a74ce91 100644 --- a/webkit/fileapi/media/mtp_device_map_service.h +++ b/webkit/fileapi/media/mtp_device_map_service.h @@ -7,7 +7,7 @@ #include <map> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" diff --git a/webkit/fileapi/mount_points.h b/webkit/fileapi/mount_points.h index 30779bb..7fcc231 100644 --- a/webkit/fileapi/mount_points.h +++ b/webkit/fileapi/mount_points.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "webkit/fileapi/file_system_util.h" #include "webkit/storage/webkit_storage_export.h" diff --git a/webkit/fileapi/native_file_util.h b/webkit/fileapi/native_file_util.h index 607e750..e54eded 100644 --- a/webkit/fileapi/native_file_util.h +++ b/webkit/fileapi/native_file_util.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_FILEAPI_NATIVE_FILE_UTIL_H_ #define WEBKIT_FILEAPI_NATIVE_FILE_UTIL_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/file_util_proxy.h" #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" diff --git a/webkit/fileapi/native_file_util_unittest.cc b/webkit/fileapi/native_file_util_unittest.cc index bf02f9d..1f31fb7 100644 --- a/webkit/fileapi/native_file_util_unittest.cc +++ b/webkit/fileapi/native_file_util_unittest.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/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/platform_file.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webkit/fileapi/obfuscated_file_util.h b/webkit/fileapi/obfuscated_file_util.h index f9d770b..1c6bcec 100644 --- a/webkit/fileapi/obfuscated_file_util.h +++ b/webkit/fileapi/obfuscated_file_util.h @@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/file_util_proxy.h" #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" diff --git a/webkit/fileapi/obfuscated_file_util_unittest.cc b/webkit/fileapi/obfuscated_file_util_unittest.cc index 07e33c9..59cca31 100644 --- a/webkit/fileapi/obfuscated_file_util_unittest.cc +++ b/webkit/fileapi/obfuscated_file_util_unittest.cc @@ -7,8 +7,8 @@ #include <vector> #include "base/bind.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/memory/scoped_ptr.h" #include "base/message_loop.h" diff --git a/webkit/fileapi/sandbox_file_stream_writer.h b/webkit/fileapi/sandbox_file_stream_writer.h index c1dfe18..28efcea 100644 --- a/webkit/fileapi/sandbox_file_stream_writer.h +++ b/webkit/fileapi/sandbox_file_stream_writer.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_FILEAPI_SANDBOX_FILE_STREAM_WRITER_H_ #define WEBKIT_FILEAPI_SANDBOX_FILE_STREAM_WRITER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" #include "googleurl/src/gurl.h" diff --git a/webkit/fileapi/sandbox_mount_point_provider.h b/webkit/fileapi/sandbox_mount_point_provider.h index b36c04f..22c7ec7 100644 --- a/webkit/fileapi/sandbox_mount_point_provider.h +++ b/webkit/fileapi/sandbox_mount_point_provider.h @@ -10,7 +10,7 @@ #include <vector> #include "base/compiler_specific.h" -#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/webkit/fileapi/sandbox_quota_observer.h b/webkit/fileapi/sandbox_quota_observer.h index ea971a4..9ca0c39 100644 --- a/webkit/fileapi/sandbox_quota_observer.h +++ b/webkit/fileapi/sandbox_quota_observer.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#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/webkit/fileapi/syncable/file_change.h b/webkit/fileapi/syncable/file_change.h index 84f0c48..f2a12e4 100644 --- a/webkit/fileapi/syncable/file_change.h +++ b/webkit/fileapi/syncable/file_change.h @@ -9,7 +9,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/syncable/sync_file_type.h" #include "webkit/storage/webkit_storage_export.h" diff --git a/webkit/fileapi/syncable/local_file_change_tracker.h b/webkit/fileapi/syncable/local_file_change_tracker.h index b638ce3..3787c62 100644 --- a/webkit/fileapi/syncable/local_file_change_tracker.h +++ b/webkit/fileapi/syncable/local_file_change_tracker.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#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/synchronization/lock.h" diff --git a/webkit/fileapi/syncable/local_file_sync_context.h b/webkit/fileapi/syncable/local_file_sync_context.h index b3d42d4..2d1bf8b 100644 --- a/webkit/fileapi/syncable/local_file_sync_context.h +++ b/webkit/fileapi/syncable/local_file_sync_context.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/webkit/fileapi/syncable/local_file_sync_context_unittest.cc b/webkit/fileapi/syncable/local_file_sync_context_unittest.cc index bc51c9b..32697ce 100644 --- a/webkit/fileapi/syncable/local_file_sync_context_unittest.cc +++ b/webkit/fileapi/syncable/local_file_sync_context_unittest.cc @@ -7,8 +7,8 @@ #include <vector> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/platform_file.h" #include "base/single_thread_task_runner.h" diff --git a/webkit/fileapi/syncable/syncable_file_system_util.h b/webkit/fileapi/syncable/syncable_file_system_util.h index 542856c..26e446d 100644 --- a/webkit/fileapi/syncable/syncable_file_system_util.h +++ b/webkit/fileapi/syncable/syncable_file_system_util.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/storage/webkit_storage_export.h" diff --git a/webkit/fileapi/test_file_set.h b/webkit/fileapi/test_file_set.h index 6823c6d..15009a0 100644 --- a/webkit/fileapi/test_file_set.h +++ b/webkit/fileapi/test_file_set.h @@ -7,7 +7,7 @@ #include <set> -#include "base/file_path.h" +#include "base/files/file_path.h" // Common test data structures and test cases. diff --git a/webkit/fileapi/test_mount_point_provider.h b/webkit/fileapi/test_mount_point_provider.h index 50d5b82..c6d510b 100644 --- a/webkit/fileapi/test_mount_point_provider.h +++ b/webkit/fileapi/test_mount_point_provider.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_FILEAPI_TEST_MOUNT_POINT_PROVIDER_H_ #define WEBKIT_FILEAPI_TEST_MOUNT_POINT_PROVIDER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "webkit/fileapi/async_file_util_adapter.h" diff --git a/webkit/glue/dom_serializer_unittest.cc b/webkit/glue/dom_serializer_unittest.cc index 8144967..d043bd0 100644 --- a/webkit/glue/dom_serializer_unittest.cc +++ b/webkit/glue/dom_serializer_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/hash_tables.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" diff --git a/webkit/glue/glue_serialize.h b/webkit/glue/glue_serialize.h index 38df965..d01e5a1 100644 --- a/webkit/glue/glue_serialize.h +++ b/webkit/glue/glue_serialize.h @@ -12,7 +12,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" #include "webkit/glue/webkit_glue_export.h" diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/glue/resource_loader_bridge.h index 840c802..242ba3a 100644 --- a/webkit/glue/resource_loader_bridge.h +++ b/webkit/glue/resource_loader_bridge.h @@ -23,7 +23,7 @@ #if defined(OS_POSIX) #include "base/file_descriptor_posix.h" #endif -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/platform_file.h" #include "base/time.h" diff --git a/webkit/glue/resource_request_body_unittest.cc b/webkit/glue/resource_request_body_unittest.cc index c596739..70cecef 100644 --- a/webkit/glue/resource_request_body_unittest.cc +++ b/webkit/glue/resource_request_body_unittest.cc @@ -6,8 +6,8 @@ #include <algorithm> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/time.h" diff --git a/webkit/glue/web_intent_data.h b/webkit/glue/web_intent_data.h index 1d18428..a7605a26 100644 --- a/webkit/glue/web_intent_data.h +++ b/webkit/glue/web_intent_data.h @@ -8,7 +8,7 @@ #include <map> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "base/values.h" #include "googleurl/src/gurl.h" diff --git a/webkit/glue/web_intent_reply_data.h b/webkit/glue/web_intent_reply_data.h index 038c022..5ee88a9 100644 --- a/webkit/glue/web_intent_reply_data.h +++ b/webkit/glue/web_intent_reply_data.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_GLUE_WEB_INTENT_REPLY_DATA_H_ #define WEBKIT_GLUE_WEB_INTENT_REPLY_DATA_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "webkit/glue/webkit_glue_export.h" diff --git a/webkit/glue/webfileutilities_impl.cc b/webkit/glue/webfileutilities_impl.cc index f937ffd..b5a5a78 100644 --- a/webkit/glue/webfileutilities_impl.cc +++ b/webkit/glue/webfileutilities_impl.cc @@ -4,8 +4,8 @@ #include "webkit/glue/webfileutilities_impl.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "net/base/file_stream.h" #include "net/base/net_util.h" diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc index c5838f9..2210d67 100644 --- a/webkit/glue/weburlloader_impl.cc +++ b/webkit/glue/weburlloader_impl.cc @@ -7,7 +7,7 @@ #include "webkit/glue/weburlloader_impl.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/process_util.h" @@ -24,8 +24,8 @@ #include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPLoadInfo.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoadTiming.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoaderClient.h" +#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoadTiming.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" diff --git a/webkit/media/android/webmediaplayer_android.cc b/webkit/media/android/webmediaplayer_android.cc index 2c2f123..5a13502 100644 --- a/webkit/media/android/webmediaplayer_android.cc +++ b/webkit/media/android/webmediaplayer_android.cc @@ -4,7 +4,7 @@ #include "webkit/media/android/webmediaplayer_android.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "media/base/android/media_player_bridge.h" #include "media/base/video_frame.h" diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.cc b/webkit/media/crypto/ppapi/clear_key_cdm.cc index 1665588e..435a982 100644 --- a/webkit/media/crypto/ppapi/clear_key_cdm.cc +++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc @@ -24,7 +24,7 @@ static const int64 kNoTimestamp = kint64min; #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER) #include "base/at_exit.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "media/base/media.h" #include "webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h" diff --git a/webkit/plugins/npapi/plugin_instance.h b/webkit/plugins/npapi/plugin_instance.h index f7c825e..c353acc 100644 --- a/webkit/plugins/npapi/plugin_instance.h +++ b/webkit/plugins/npapi/plugin_instance.h @@ -14,7 +14,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "googleurl/src/gurl.h" #include "third_party/npapi/bindings/npapi.h" diff --git a/webkit/plugins/npapi/plugin_list.h b/webkit/plugins/npapi/plugin_list.h index 1cd82ed..dcf7af7 100644 --- a/webkit/plugins/npapi/plugin_list.h +++ b/webkit/plugins/npapi/plugin_list.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_vector.h" diff --git a/webkit/plugins/npapi/plugin_stream.h b/webkit/plugins/npapi/plugin_stream.h index 10993f0..ec987be 100644 --- a/webkit/plugins/npapi/plugin_stream.h +++ b/webkit/plugins/npapi/plugin_stream.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "build/build_config.h" #include "third_party/npapi/bindings/npapi.h" diff --git a/webkit/plugins/npapi/plugin_stream_posix.cc b/webkit/plugins/npapi/plugin_stream_posix.cc index ab4b0d4..775974c 100644 --- a/webkit/plugins/npapi/plugin_stream_posix.cc +++ b/webkit/plugins/npapi/plugin_stream_posix.cc @@ -6,8 +6,8 @@ #include <string.h> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "webkit/plugins/npapi/plugin_instance.h" diff --git a/webkit/plugins/npapi/webplugin_impl.h b/webkit/plugins/npapi/webplugin_impl.h index 90ac280..20917d0 100644 --- a/webkit/plugins/npapi/webplugin_impl.h +++ b/webkit/plugins/npapi/webplugin_impl.h @@ -5,12 +5,12 @@ #ifndef WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_IMPL_H_ #define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_IMPL_H_ -#include <string> #include <map> +#include <string> #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "googleurl/src/gurl.h" diff --git a/webkit/plugins/ppapi/plugin_module.h b/webkit/plugins/ppapi/plugin_module.h index ecf17bb..2266a8b 100644 --- a/webkit/plugins/ppapi/plugin_module.h +++ b/webkit/plugins/ppapi/plugin_module.h @@ -10,7 +10,7 @@ #include <string> #include "base/basictypes.h" -#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/webkit/plugins/ppapi/ppb_file_ref_impl.h b/webkit/plugins/ppapi/ppb_file_ref_impl.h index 4d455a7..a1856c0 100644 --- a/webkit/plugins/ppapi/ppb_file_ref_impl.h +++ b/webkit/plugins/ppapi/ppb_file_ref_impl.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "googleurl/src/gurl.h" #include "ppapi/c/ppb_file_ref.h" #include "ppapi/shared_impl/ppb_file_ref_shared.h" diff --git a/webkit/plugins/webplugininfo.h b/webkit/plugins/webplugininfo.h index 514a046..b08e349 100644 --- a/webkit/plugins/webplugininfo.h +++ b/webkit/plugins/webplugininfo.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "webkit/plugins/webkit_plugins_export.h" namespace webkit { diff --git a/webkit/quota/quota_database.h b/webkit/quota/quota_database.h index a5c8a27..6b01410 100644 --- a/webkit/quota/quota_database.h +++ b/webkit/quota/quota_database.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" diff --git a/webkit/quota/quota_manager.cc b/webkit/quota/quota_manager.cc index 1801372..9c79ed7 100644 --- a/webkit/quota/quota_manager.cc +++ b/webkit/quota/quota_manager.cc @@ -13,11 +13,11 @@ #include "base/bind_helpers.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/metrics/histogram.h" #include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" -#include "base/metrics/histogram.h" #include "base/string_number_conversions.h" #include "base/sys_info.h" #include "base/task_runner_util.h" diff --git a/webkit/quota/quota_manager.h b/webkit/quota/quota_manager.h index b8d9e18..d79f188 100644 --- a/webkit/quota/quota_manager.h +++ b/webkit/quota/quota_manager.h @@ -15,7 +15,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#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/webkit/support/platform_support_android.cc b/webkit/support/platform_support_android.cc index 67a43b4..0acc1ab 100644 --- a/webkit/support/platform_support_android.cc +++ b/webkit/support/platform_support_android.cc @@ -5,8 +5,8 @@ #include "webkit/support/platform_support.h" #include "base/android/jni_android.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/string16.h" @@ -14,9 +14,9 @@ #include "base/test/test_support_android.h" #include "googleurl/src/gurl.h" #include "grit/webkit_resources.h" -#include "net/android/network_library.h" -#include "net/android/net_jni_registrar.h" #include "media/base/android/media_jni_registrar.h" +#include "net/android/net_jni_registrar.h" +#include "net/android/network_library.h" #include "ui/android/ui_jni_registrar.h" #include "ui/base/resource/resource_bundle.h" #include "webkit/support/test_webkit_platform_support.h" diff --git a/webkit/support/platform_support_linux.cc b/webkit/support/platform_support_linux.cc index a26c5f4..ce622ea 100644 --- a/webkit/support/platform_support_linux.cc +++ b/webkit/support/platform_support_linux.cc @@ -4,8 +4,8 @@ #include "webkit/support/platform_support.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/string16.h" diff --git a/webkit/support/platform_support_win.cc b/webkit/support/platform_support_win.cc index f1c61b9..e87f0bd 100644 --- a/webkit/support/platform_support_win.cc +++ b/webkit/support/platform_support_win.cc @@ -5,8 +5,8 @@ #include "webkit/support/platform_support.h" #include "base/base_paths.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/string16.h" diff --git a/webkit/support/simple_database_system.h b/webkit/support/simple_database_system.h index 3fef6f8f..8a40c3f 100644 --- a/webkit/support/simple_database_system.h +++ b/webkit/support/simple_database_system.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_SUPPORT_SIMPLE_DATABASE_SYSTEM_H_ #define WEBKIT_SUPPORT_SIMPLE_DATABASE_SYSTEM_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/hash_tables.h" #include "base/memory/ref_counted.h" diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 796fb0b..788d214 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -11,8 +11,8 @@ #include "base/command_line.h" #include "base/debug/debugger.h" #include "base/debug/stack_trace.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/i18n/icu_util.h" #include "base/logging.h" diff --git a/webkit/support/weburl_loader_mock_factory.h b/webkit/support/weburl_loader_mock_factory.h index 85fe0cc0..1cbb588 100644 --- a/webkit/support/weburl_loader_mock_factory.h +++ b/webkit/support/weburl_loader_mock_factory.h @@ -7,7 +7,7 @@ #include <map> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" diff --git a/webkit/tools/test_shell/image_decoder_unittest.cc b/webkit/tools/test_shell/image_decoder_unittest.cc index 0458af2..bf9514b 100644 --- a/webkit/tools/test_shell/image_decoder_unittest.cc +++ b/webkit/tools/test_shell/image_decoder_unittest.cc @@ -4,8 +4,8 @@ #include "webkit/tools/test_shell/image_decoder_unittest.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/md5.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/webkit/tools/test_shell/image_decoder_unittest.h b/webkit/tools/test_shell/image_decoder_unittest.h index 85b88c2..29d2372 100644 --- a/webkit/tools/test_shell/image_decoder_unittest.h +++ b/webkit/tools/test_shell/image_decoder_unittest.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webkit/tools/test_shell/plugin_tests.cc b/webkit/tools/test_shell/plugin_tests.cc index ec352b4..0359182 100644 --- a/webkit/tools/test_shell/plugin_tests.cc +++ b/webkit/tools/test_shell/plugin_tests.cc @@ -4,8 +4,8 @@ #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string_util.h" #include "net/base/escape.h" diff --git a/webkit/tools/test_shell/simple_appcache_system.h b/webkit/tools/test_shell/simple_appcache_system.h index 7371913..4a4cbce 100644 --- a/webkit/tools/test_shell/simple_appcache_system.h +++ b/webkit/tools/test_shell/simple_appcache_system.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_TOOLS_TEST_SHELL_SIMPLE_APPCACHE_SYSTEM_H_ #define WEBKIT_TOOLS_TEST_SHELL_SIMPLE_APPCACHE_SYSTEM_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/threading/thread.h" #include "webkit/appcache/appcache_backend_impl.h" diff --git a/webkit/tools/test_shell/simple_file_system.cc b/webkit/tools/test_shell/simple_file_system.cc index c4f7d9e..8950705 100644 --- a/webkit/tools/test_shell/simple_file_system.cc +++ b/webkit/tools/test_shell/simple_file_system.cc @@ -5,7 +5,7 @@ #include "webkit/tools/test_shell/simple_file_system.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/time.h" diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc index de1f474..d8ef28e 100644 --- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc +++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc @@ -34,8 +34,8 @@ #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index 677dc42..8895e4f 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -9,8 +9,8 @@ #include "base/base_paths.h" #include "base/command_line.h" #include "base/debug/debug_on_start_win.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/md5.h" #include "base/message_loop.h" #include "base/metrics/stats_table.h" @@ -27,6 +27,7 @@ #include "net/url_request/url_request_filter.h" #include "skia/ext/bitmap_platform_device.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" @@ -35,12 +36,11 @@ #include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientationClientMock.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationClientMock.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationClientMock.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" -#include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/size.h" #include "webkit/glue/glue_serialize.h" diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h index e464423..c6394e9 100644 --- a/webkit/tools/test_shell/test_shell.h +++ b/webkit/tools/test_shell/test_shell.h @@ -12,7 +12,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/lazy_instance.h" #include "base/memory/ref_counted.h" diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc index 6576d07..527d937 100644 --- a/webkit/tools/test_shell/test_shell_gtk.cc +++ b/webkit/tools/test_shell/test_shell_gtk.cc @@ -11,8 +11,8 @@ #include <signal.h> #include <unistd.h> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/string16.h" diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm index fe86310..b025e69 100644 --- a/webkit/tools/test_shell/test_shell_mac.mm +++ b/webkit/tools/test_shell/test_shell_mac.mm @@ -12,8 +12,8 @@ #include "base/base_paths.h" #include "base/basictypes.h" #include "base/debug/debugger.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc index 5c98d98..36c761d 100644 --- a/webkit/tools/test_shell/test_shell_main.cc +++ b/webkit/tools/test_shell/test_shell_main.cc @@ -9,8 +9,8 @@ #include "base/debug/trace_event.h" #include "base/environment.h" #include "base/event_recorder.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/i18n/icu_util.h" #include "base/message_loop.h" #include "base/metrics/stats_table.h" diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc index 31ed78b..fd07b3b 100644 --- a/webkit/tools/test_shell/test_shell_request_context.cc +++ b/webkit/tools/test_shell/test_shell_request_context.cc @@ -7,7 +7,7 @@ #include "build/build_config.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/thread_task_runner_handle.h" #include "base/threading/worker_pool.h" #include "net/base/cert_verifier.h" diff --git a/webkit/tools/test_shell/test_shell_test.cc b/webkit/tools/test_shell/test_shell_test.cc index 2ea5e74..af50477 100644 --- a/webkit/tools/test_shell/test_shell_test.cc +++ b/webkit/tools/test_shell/test_shell_test.cc @@ -7,8 +7,8 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/string_util.h" diff --git a/webkit/tools/test_shell/test_shell_test.h b/webkit/tools/test_shell/test_shell_test.h index c29a37d..b6c7f17 100644 --- a/webkit/tools/test_shell/test_shell_test.h +++ b/webkit/tools/test_shell/test_shell_test.h @@ -12,7 +12,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/window_open_disposition.h" #include "webkit/tools/test_shell/test_shell.h" diff --git a/win8/delegate_execute/chrome_util.cc b/win8/delegate_execute/chrome_util.cc index b67e80f..ad00bad 100644 --- a/win8/delegate_execute/chrome_util.cc +++ b/win8/delegate_execute/chrome_util.cc @@ -4,16 +4,16 @@ #include "win8/delegate_execute/chrome_util.h" +#include <windows.h> #include <atlbase.h> #include <shlobj.h> -#include <windows.h> #include <algorithm> #include <limits> #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/md5.h" #include "base/process_util.h" #include "base/string_util.h" diff --git a/win8/delegate_execute/command_execute_impl.h b/win8/delegate_execute/command_execute_impl.h index 1b137d9..b968b60 100644 --- a/win8/delegate_execute/command_execute_impl.h +++ b/win8/delegate_execute/command_execute_impl.h @@ -11,7 +11,7 @@ #include <string> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process_util.h" #include "win8/delegate_execute/resource.h" // main symbols diff --git a/win8/delegate_execute/delegate_execute_operation.h b/win8/delegate_execute/delegate_execute_operation.h index 8d2900d..6492ac6 100644 --- a/win8/delegate_execute/delegate_execute_operation.h +++ b/win8/delegate_execute/delegate_execute_operation.h @@ -5,11 +5,11 @@ #ifndef WIN8_DELEGATE_EXECUTE_DELEGATE_EXECUTE_OPERATION_H_ #define WIN8_DELEGATE_EXECUTE_DELEGATE_EXECUTE_OPERATION_H_ -#include <atldef.h> #include <windows.h> +#include <atldef.h> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" class CommandLine; diff --git a/win8/delegate_execute/delegate_execute_util.cc b/win8/delegate_execute/delegate_execute_util.cc index 70ca3e3..6630fd6 100644 --- a/win8/delegate_execute/delegate_execute_util.cc +++ b/win8/delegate_execute/delegate_execute_util.cc @@ -4,7 +4,7 @@ #include "win8/delegate_execute/delegate_execute_util.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" namespace delegate_execute { diff --git a/win8/delegate_execute/delegate_execute_util_unittest.cc b/win8/delegate_execute/delegate_execute_util_unittest.cc index 6fcf65d..d0cf3b3 100644 --- a/win8/delegate_execute/delegate_execute_util_unittest.cc +++ b/win8/delegate_execute/delegate_execute_util_unittest.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/win8/metro_driver/file_picker.cc b/win8/metro_driver/file_picker.cc index 4979f4c..acb66e9 100644 --- a/win8/metro_driver/file_picker.cc +++ b/win8/metro_driver/file_picker.cc @@ -8,13 +8,13 @@ #include <windows.storage.pickers.h> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/string_util.h" #include "base/synchronization/waitable_event.h" -#include "base/win/scoped_comptr.h" #include "base/win/metro.h" +#include "base/win/scoped_comptr.h" #include "win8/metro_driver/chrome_app_view.h" #include "win8/metro_driver/winrt_utils.h" diff --git a/win8/metro_driver/file_picker_ash.cc b/win8/metro_driver/file_picker_ash.cc index 816defa..37f588a 100644 --- a/win8/metro_driver/file_picker_ash.cc +++ b/win8/metro_driver/file_picker_ash.cc @@ -6,13 +6,13 @@ #include "win8/metro_driver/file_picker_ash.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/string_util.h" #include "base/synchronization/waitable_event.h" -#include "base/win/scoped_comptr.h" #include "base/win/metro.h" +#include "base/win/scoped_comptr.h" #include "ui/metro_viewer/metro_viewer_messages.h" #include "win8/metro_driver/chrome_app_view_ash.h" #include "win8/metro_driver/winrt_utils.h" diff --git a/win8/metro_driver/secondary_tile.h b/win8/metro_driver/secondary_tile.h index ed3f58f..0fba5096 100644 --- a/win8/metro_driver/secondary_tile.h +++ b/win8/metro_driver/secondary_tile.h @@ -4,7 +4,7 @@ #ifndef CHROME_BROWSER_UI_METRO_DRIVER_SECONDARY_TILE_H_ #define CHROME_BROWSER_UI_METRO_DRIVER_SECONDARY_TILE_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "base/win/metro.h" diff --git a/win8/metro_driver/toast_notification_handler.cc b/win8/metro_driver/toast_notification_handler.cc index 525331e..9448e12 100644 --- a/win8/metro_driver/toast_notification_handler.cc +++ b/win8/metro_driver/toast_notification_handler.cc @@ -7,7 +7,7 @@ #include "win8/metro_driver/stdafx.h" #include "win8/metro_driver/toast_notification_handler.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/utf_string_conversions.h" diff --git a/win8/metro_driver/winrt_utils.cc b/win8/metro_driver/winrt_utils.cc index 8df33f0..e956c47 100644 --- a/win8/metro_driver/winrt_utils.cc +++ b/win8/metro_driver/winrt_utils.cc @@ -7,7 +7,7 @@ #include <shlobj.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/win/scoped_com_initializer.h" #include "base/win/scoped_comptr.h" diff --git a/win8/test/metro_registration_helper.cc b/win8/test/metro_registration_helper.cc index 97442a8..bfcfb29 100644 --- a/win8/test/metro_registration_helper.cc +++ b/win8/test/metro_registration_helper.cc @@ -5,8 +5,8 @@ #include "win8/test/metro_registration_helper.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/process.h" diff --git a/win8/test/test_registrar.cc b/win8/test/test_registrar.cc index 04c2ec9..1588a21 100644 --- a/win8/test/test_registrar.cc +++ b/win8/test/test_registrar.cc @@ -20,7 +20,7 @@ #include "base/at_exit.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/stringprintf.h" |