| Index: webkit/tools/test_shell/test_webview_delegate.cc
 | 
| diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
 | 
| index 1ec298003b6826243ee4bb0c1375220100772b02..e9462552e8f5457db7c0d4e4c153a9127e7bedb9 100644
 | 
| --- a/webkit/tools/test_shell/test_webview_delegate.cc
 | 
| +++ b/webkit/tools/test_shell/test_webview_delegate.cc
 | 
| @@ -12,9 +12,9 @@
 | 
|  #include "base/file_util.h"
 | 
|  #include "base/message_loop.h"
 | 
|  #include "base/process_util.h"
 | 
| +#include "base/string_number_conversions.h"
 | 
|  #include "base/string_util.h"
 | 
|  #include "base/stringprintf.h"
 | 
| -#include "base/string_number_conversions.h"
 | 
|  #include "base/utf_string_conversions.h"
 | 
|  #include "media/base/filter_collection.h"
 | 
|  #include "media/base/media_log.h"
 | 
| @@ -34,14 +34,14 @@
 | 
|  #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h"
 | 
|  #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
 | 
|  #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"
 | 
| -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientationClientMock.h"
 | 
|  #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
 | 
| +#include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientationClientMock.h"
 | 
|  #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 | 
| -#include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h"
 | 
|  #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileError.h"
 | 
|  #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.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/WebHistoryItem.h"
 | 
|  #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 | 
|  #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
 | 
|  #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h"
 | 
| @@ -52,6 +52,7 @@
 | 
|  #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h"
 | 
|  #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 | 
|  #include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h"
 | 
| +#include "ui/base/window_open_disposition.h"
 | 
|  #include "ui/gfx/native_widget_types.h"
 | 
|  #include "ui/gfx/point.h"
 | 
|  #include "webkit/appcache/web_application_cache_host_impl.h"
 | 
| @@ -60,13 +61,12 @@
 | 
|  #include "webkit/glue/webkit_glue.h"
 | 
|  #include "webkit/glue/webpreferences.h"
 | 
|  #include "webkit/glue/weburlrequest_extradata_impl.h"
 | 
| -#include "webkit/glue/window_open_disposition.h"
 | 
|  #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
 | 
|  #include "webkit/media/webmediaplayer_impl.h"
 | 
|  #include "webkit/media/webmediaplayer_params.h"
 | 
| -#include "webkit/plugins/npapi/webplugin_impl.h"
 | 
|  #include "webkit/plugins/npapi/plugin_list.h"
 | 
|  #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 | 
| +#include "webkit/plugins/npapi/webplugin_impl.h"
 | 
|  #include "webkit/tools/test_shell/mock_spellcheck.h"
 | 
|  #include "webkit/tools/test_shell/notification_presenter.h"
 | 
|  #include "webkit/tools/test_shell/simple_appcache_system.h"
 | 
| 
 |