Index: webkit/support/test_webkit_platform_support.cc |
diff --git a/webkit/support/test_webkit_platform_support.cc b/webkit/support/test_webkit_platform_support.cc |
index 7437979f57ae46768f97779c557ef65821201625..c3795768a5a412e0255495d87c0ed41ddc35fb7d 100644 |
--- a/webkit/support/test_webkit_platform_support.cc |
+++ b/webkit/support/test_webkit_platform_support.cc |
@@ -5,9 +5,9 @@ |
#include "webkit/support/test_webkit_platform_support.h" |
#include "base/file_util.h" |
+#include "base/files/scoped_temp_dir.h" |
#include "base/metrics/stats_counters.h" |
#include "base/path_service.h" |
-#include "base/scoped_temp_dir.h" |
#include "base/string_util.h" |
#include "base/utf_string_conversions.h" |
#include "media/base/media.h" |
@@ -17,9 +17,11 @@ |
#include "third_party/hyphen/hyphen.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebAudioDevice.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFileSystem.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGamepads.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" |
@@ -28,8 +30,6 @@ |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageArea.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispatcher.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" |
#include "v8/include/v8.h" |
#include "webkit/appcache/web_application_cache_host_impl.h" |
#include "webkit/database/vfs_backend.h" |
@@ -40,18 +40,18 @@ |
#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" |
#include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" |
#include "webkit/plugins/npapi/plugin_list.h" |
-#include "webkit/support/simple_database_system.h" |
#include "webkit/support/gc_extension.h" |
+#include "webkit/support/simple_database_system.h" |
#include "webkit/support/test_webmessageportchannel.h" |
-#include "webkit/support/webkit_support.h" |
-#include "webkit/support/weburl_loader_mock_factory.h" |
#include "webkit/support/web_audio_device_mock.h" |
#include "webkit/support/web_gesture_curve_mock.h" |
+#include "webkit/support/webkit_support.h" |
+#include "webkit/support/weburl_loader_mock_factory.h" |
#include "webkit/tools/test_shell/mock_webclipboard_impl.h" |
#include "webkit/tools/test_shell/simple_appcache_system.h" |
#include "webkit/tools/test_shell/simple_file_system.h" |
-#include "webkit/tools/test_shell/simple_socket_stream_bridge.h" |
#include "webkit/tools/test_shell/simple_resource_loader_bridge.h" |
+#include "webkit/tools/test_shell/simple_socket_stream_bridge.h" |
#include "webkit/tools/test_shell/simple_webcookiejar_impl.h" |
#include "webkit/tools/test_shell/test_shell_request_context.h" |
#include "webkit/tools/test_shell/test_shell_webblobregistry_impl.h" |
@@ -391,7 +391,7 @@ class TestWebIDBFactory : public WebKit::WebIDBFactory { |
} |
private: |
scoped_ptr<WebIDBFactory> factory_; |
- ScopedTempDir indexed_db_dir_; |
+ base::ScopedTempDir indexed_db_dir_; |
WebString data_dir_; |
}; |