diff options
| -rw-r--r-- | base/files/memory_mapped_file.cc | 2 | ||||
| -rw-r--r-- | base/files/memory_mapped_file_win.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/policy/resource_cache.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync_file_system/fake_remote_change_processor.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/test/test_server.h | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/base/files/memory_mapped_file.cc b/base/files/memory_mapped_file.cc index 9e98bc6..a48ec0c 100644 --- a/base/files/memory_mapped_file.cc +++ b/base/files/memory_mapped_file.cc @@ -4,7 +4,7 @@ #include "base/files/memory_mapped_file.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" namespace base { diff --git a/base/files/memory_mapped_file_win.cc b/base/files/memory_mapped_file_win.cc index 1a24de2..5b89c85 100644 --- a/base/files/memory_mapped_file_win.cc +++ b/base/files/memory_mapped_file_win.cc @@ -4,7 +4,7 @@ #include "base/files/memory_mapped_file.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/string16.h" diff --git a/chrome/browser/policy/resource_cache.cc b/chrome/browser/policy/resource_cache.cc index cb5796d..a0125c3 100644 --- a/chrome/browser/policy/resource_cache.cc +++ b/chrome/browser/policy/resource_cache.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 "base/string_util.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/sync_file_system/fake_remote_change_processor.cc b/chrome/browser/sync_file_system/fake_remote_change_processor.cc index a646fef..2cf436a 100644 --- a/chrome/browser/sync_file_system/fake_remote_change_processor.cc +++ b/chrome/browser/sync_file_system/fake_remote_change_processor.cc @@ -5,7 +5,7 @@ #include "chrome/browser/sync_file_system/fake_remote_change_processor.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/message_loop_proxy.h" #include "webkit/fileapi/file_system_url.h" diff --git a/chrome_frame/test/test_server.h b/chrome_frame/test/test_server.h index d4f9281..66cf3f9 100644 --- a/chrome_frame/test/test_server.h +++ b/chrome_frame/test/test_server.h @@ -39,7 +39,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/memory_mapped_file.h" #include "base/message_loop.h" #include "net/base/stream_listen_socket.h" @@ -204,7 +204,7 @@ class ResponseForPath : public Response { } protected: - std::string request_path_; + std::string request_path_; private: DISALLOW_COPY_AND_ASSIGN(ResponseForPath); |