diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 02:51:09 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 02:51:09 +0000 |
| commit | b7d38af7d27176481cb791759ea23c3de01d4b9a (patch) | |
| tree | 28da16cb8e75414e2201aac9c4b0609ef68b6a08 /webkit/fileapi | |
| parent | f9032755ef38bf62ede70bab84860c54dc892b7d (diff) | |
| download | chromium_src-b7d38af7d27176481cb791759ea23c3de01d4b9a.zip chromium_src-b7d38af7d27176481cb791759ea23c3de01d4b9a.tar.gz chromium_src-b7d38af7d27176481cb791759ea23c3de01d4b9a.tar.bz2 | |
Cleanup: Remove unneeded scoped_ptr.h includes from webkit.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10408078
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138426 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi')
| -rw-r--r-- | webkit/fileapi/file_system_mount_point_provider.h | 1 | ||||
| -rw-r--r-- | webkit/fileapi/file_system_quota_client.h | 3 | ||||
| -rw-r--r-- | webkit/fileapi/file_system_test_helper.h | 1 | ||||
| -rw-r--r-- | webkit/fileapi/isolated_context.cc | 2 | ||||
| -rw-r--r-- | webkit/fileapi/local_file_util.h | 2 | ||||
| -rw-r--r-- | webkit/fileapi/mock_file_system_options.h | 3 | ||||
| -rw-r--r-- | webkit/fileapi/sandbox_mount_point_provider.h | 3 |
7 files changed, 6 insertions, 9 deletions
diff --git a/webkit/fileapi/file_system_mount_point_provider.h b/webkit/fileapi/file_system_mount_point_provider.h index 6373f8a..4da7a1b3 100644 --- a/webkit/fileapi/file_system_mount_point_provider.h +++ b/webkit/fileapi/file_system_mount_point_provider.h @@ -10,7 +10,6 @@ #include "base/callback_forward.h" #include "base/file_path.h" -#include "base/memory/scoped_ptr.h" #include "base/platform_file.h" #include "webkit/fileapi/file_system_types.h" diff --git a/webkit/fileapi/file_system_quota_client.h b/webkit/fileapi/file_system_quota_client.h index cc4cd37..626f9fe 100644 --- a/webkit/fileapi/file_system_quota_client.h +++ b/webkit/fileapi/file_system_quota_client.h @@ -10,8 +10,9 @@ #include <utility> #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "base/file_path.h" -#include "base/memory/scoped_ptr.h" +#include "base/memory/ref_counted.h" #include "webkit/fileapi/file_system_quota_util.h" #include "webkit/fileapi/file_system_types.h" #include "webkit/quota/quota_client.h" diff --git a/webkit/fileapi/file_system_test_helper.h b/webkit/fileapi/file_system_test_helper.h index 9aab095..b4037ce4 100644 --- a/webkit/fileapi/file_system_test_helper.h +++ b/webkit/fileapi/file_system_test_helper.h @@ -10,7 +10,6 @@ #include "base/file_path.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include "googleurl/src/gurl.h" #include "webkit/fileapi/file_system_path.h" #include "webkit/fileapi/file_system_types.h" diff --git a/webkit/fileapi/isolated_context.cc b/webkit/fileapi/isolated_context.cc index 61133f6..cc9e925 100644 --- a/webkit/fileapi/isolated_context.cc +++ b/webkit/fileapi/isolated_context.cc @@ -17,7 +17,7 @@ static base::LazyInstance<IsolatedContext>::Leaky g_isolated_context = // static IsolatedContext* IsolatedContext::GetInstance() { - return &g_isolated_context.Get(); + return g_isolated_context.Pointer(); } std::string IsolatedContext::RegisterIsolatedFileSystem( diff --git a/webkit/fileapi/local_file_util.h b/webkit/fileapi/local_file_util.h index 38b8b2b..89ce879 100644 --- a/webkit/fileapi/local_file_util.h +++ b/webkit/fileapi/local_file_util.h @@ -8,11 +8,11 @@ #include <vector> #include "base/callback_forward.h" +#include "base/compiler_specific.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/file_util_proxy.h" #include "base/logging.h" -#include "base/memory/scoped_ptr.h" #include "base/platform_file.h" #include "webkit/fileapi/file_system_file_util.h" #include "webkit/fileapi/file_system_types.h" diff --git a/webkit/fileapi/mock_file_system_options.h b/webkit/fileapi/mock_file_system_options.h index e6cd729..22ad237 100644 --- a/webkit/fileapi/mock_file_system_options.h +++ b/webkit/fileapi/mock_file_system_options.h @@ -5,9 +5,6 @@ #ifndef WEBKIT_FILEAPI_MOCK_FILE_SYSTEM_OPTIONS_H_ #define WEBKIT_FILEAPI_MOCK_FILE_SYSTEM_OPTIONS_H_ -#include "base/basictypes.h" -#include "base/compiler_specific.h" -#include "base/memory/scoped_ptr.h" #include "webkit/fileapi/file_system_options.h" namespace fileapi { diff --git a/webkit/fileapi/sandbox_mount_point_provider.h b/webkit/fileapi/sandbox_mount_point_provider.h index b38c48d..1219f95 100644 --- a/webkit/fileapi/sandbox_mount_point_provider.h +++ b/webkit/fileapi/sandbox_mount_point_provider.h @@ -9,8 +9,9 @@ #include <string> #include <vector> +#include "base/compiler_specific.h" #include "base/file_path.h" -#include "base/memory/scoped_ptr.h" +#include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "googleurl/src/gurl.h" #include "webkit/fileapi/file_system_mount_point_provider.h" |