diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:12:35 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:12:35 +0000 |
| commit | e0e75f67163f77051d8f62d5275dbf40627d5398 (patch) | |
| tree | 070d431dc290d9b9a69c79ceeb94ba7574ef1c31 /webkit | |
| parent | 3370e3b7ee18664a43a9977efeab2166624d0a32 (diff) | |
| download | chromium_src-e0e75f67163f77051d8f62d5275dbf40627d5398.zip chromium_src-e0e75f67163f77051d8f62d5275dbf40627d5398.tar.gz chromium_src-e0e75f67163f77051d8f62d5275dbf40627d5398.tar.bz2 | |
Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put
them in the webkit::npapi namespace.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6012002
TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/5961004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
64 files changed, 415 insertions, 697 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 14ca0bb..13545b8 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -168,75 +168,6 @@ # This list contains all .h, .cc, and .mm files in glue except for # those in the test subdirectory and those with unittest in in their # names. - '../plugins/npapi/carbon_plugin_window_tracker_mac.cc', - '../plugins/npapi/carbon_plugin_window_tracker_mac.h', - '../plugins/npapi/coregraphics_private_symbols_mac.h', - '../plugins/npapi/default_plugin_shared.h', - '../plugins/npapi/gtk_plugin_container.cc', - '../plugins/npapi/gtk_plugin_container.h', - '../plugins/npapi/gtk_plugin_container_manager.cc', - '../plugins/npapi/gtk_plugin_container_manager.h', - '../plugins/npapi/npapi_extension_thunk.cc', - '../plugins/npapi/npapi_extension_thunk.h', - '../plugins/npapi/nphostapi.h', - '../plugins/npapi/plugin_constants_win.cc', - '../plugins/npapi/plugin_constants_win.h', - '../plugins/npapi/plugin_group.cc', - '../plugins/npapi/plugin_group.h', - '../plugins/npapi/plugin_host.cc', - '../plugins/npapi/plugin_host.h', - '../plugins/npapi/plugin_instance.cc', - '../plugins/npapi/plugin_instance.h', - '../plugins/npapi/plugin_instance_mac.mm', - '../plugins/npapi/plugin_lib.cc', - '../plugins/npapi/plugin_lib.h', - '../plugins/npapi/plugin_lib_mac.mm', - '../plugins/npapi/plugin_lib_posix.cc', - '../plugins/npapi/plugin_lib_win.cc', - '../plugins/npapi/plugin_list.cc', - '../plugins/npapi/plugin_list.h', - '../plugins/npapi/plugin_list_mac.mm', - '../plugins/npapi/plugin_list_posix.cc', - '../plugins/npapi/plugin_list_win.cc', - '../plugins/npapi/plugin_stream.cc', - '../plugins/npapi/plugin_stream.h', - '../plugins/npapi/plugin_stream_posix.cc', - '../plugins/npapi/plugin_stream_url.cc', - '../plugins/npapi/plugin_stream_url.h', - '../plugins/npapi/plugin_stream_win.cc', - '../plugins/npapi/plugin_string_stream.cc', - '../plugins/npapi/plugin_string_stream.h', - '../plugins/npapi/plugin_web_event_converter_mac.h', - '../plugins/npapi/plugin_web_event_converter_mac.mm', - '../plugins/npapi/ppb_private.h', - '../plugins/npapi/quickdraw_drawing_manager_mac.cc', - '../plugins/npapi/quickdraw_drawing_manager_mac.h', - '../plugins/npapi/webplugin.cc', - '../plugins/npapi/webplugin.h', - '../plugins/npapi/webplugin_2d_device_delegate.cc', - '../plugins/npapi/webplugin_2d_device_delegate.h', - '../plugins/npapi/webplugin_3d_device_delegate.cc', - '../plugins/npapi/webplugin_3d_device_delegate.h', - '../plugins/npapi/webplugin_accelerated_surface_mac.h', - '../plugins/npapi/webplugin_audio_device_delegate.cc', - '../plugins/npapi/webplugin_audio_device_delegate.h', - '../plugins/npapi/webplugin_delegate.cc', - '../plugins/npapi/webplugin_delegate.h', - '../plugins/npapi/webplugin_delegate_impl.cc', - '../plugins/npapi/webplugin_delegate_impl.h', - '../plugins/npapi/webplugin_delegate_impl_gtk.cc', - '../plugins/npapi/webplugin_delegate_impl_mac.mm', - '../plugins/npapi/webplugin_delegate_impl_win.cc', - '../plugins/npapi/webplugin_file_delegate.cc', - '../plugins/npapi/webplugin_file_delegate.h', - '../plugins/npapi/webplugin_impl.cc', - '../plugins/npapi/webplugin_impl.h', - '../plugins/npapi/webplugin_print_delegate.cc', - '../plugins/npapi/webplugin_print_delegate.h', - '../plugins/npapi/webplugininfo.cc', - '../plugins/npapi/webplugininfo.h', - '../plugins/npapi/webview_plugin.cc', - '../plugins/npapi/webview_plugin.h', '../plugins/plugin_switches.cc', '../plugins/plugin_switches.h', '../plugins/ppapi/common.h', @@ -251,14 +182,14 @@ '../plugins/ppapi/npapi_glue.cc', '../plugins/ppapi/npapi_glue.h', '../plugins/ppapi/plugin_delegate.h', - '../plugins/ppapi/plugin_module.cc', - '../plugins/ppapi/plugin_module.h', - '../plugins/ppapi/plugin_object.cc', - '../plugins/ppapi/plugin_object.h', '../plugins/ppapi/ppapi_plugin_instance.cc', '../plugins/ppapi/ppapi_plugin_instance.h', '../plugins/ppapi/ppapi_webplugin_impl.cc', '../plugins/ppapi/ppapi_webplugin_impl.h', + '../plugins/ppapi/plugin_module.cc', + '../plugins/ppapi/plugin_module.h', + '../plugins/ppapi/plugin_object.cc', + '../plugins/ppapi/plugin_object.h', '../plugins/ppapi/ppb_audio_impl.cc', '../plugins/ppapi/ppb_audio_impl.h', '../plugins/ppapi/ppb_buffer_impl.cc', @@ -334,6 +265,75 @@ 'media/web_data_source.cc', 'media/web_data_source.h', 'media/web_video_renderer.h', + 'plugins/carbon_plugin_window_tracker_mac.h', + 'plugins/carbon_plugin_window_tracker_mac.cc', + 'plugins/coregraphics_private_symbols_mac.h', + 'plugins/default_plugin_shared.h', + 'plugins/nphostapi.h', + 'plugins/gtk_plugin_container.h', + 'plugins/gtk_plugin_container.cc', + 'plugins/gtk_plugin_container_manager.h', + 'plugins/gtk_plugin_container_manager.cc', + 'plugins/npapi_extension_thunk.cc', + 'plugins/npapi_extension_thunk.h', + 'plugins/plugin_constants_win.h', + 'plugins/plugin_group.cc', + 'plugins/plugin_group.h', + 'plugins/plugin_host.cc', + 'plugins/plugin_host.h', + 'plugins/plugin_instance.cc', + 'plugins/plugin_instance.h', + 'plugins/plugin_instance_mac.mm', + 'plugins/plugin_lib.cc', + 'plugins/plugin_lib.h', + 'plugins/plugin_lib_mac.mm', + 'plugins/plugin_lib_posix.cc', + 'plugins/plugin_lib_win.cc', + 'plugins/plugin_list.cc', + 'plugins/plugin_list.h', + 'plugins/plugin_list_mac.mm', + 'plugins/plugin_list_posix.cc', + 'plugins/plugin_list_win.cc', + 'plugins/plugin_stream.cc', + 'plugins/plugin_stream.h', + 'plugins/plugin_stream_posix.cc', + 'plugins/plugin_stream_url.cc', + 'plugins/plugin_stream_url.h', + 'plugins/plugin_stream_win.cc', + 'plugins/plugin_string_stream.cc', + 'plugins/plugin_string_stream.h', + 'plugins/plugin_stubs.cc', + 'plugins/plugin_web_event_converter_mac.h', + 'plugins/plugin_web_event_converter_mac.mm', + 'plugins/ppb_private.h', + 'plugins/quickdraw_drawing_manager_mac.h', + 'plugins/quickdraw_drawing_manager_mac.cc', + 'plugins/webview_plugin.cc', + 'plugins/webview_plugin.h', + 'plugins/webplugin.cc', + 'plugins/webplugin.h', + 'plugins/webplugin_audio_device_delegate.cc', + 'plugins/webplugin_audio_device_delegate.h', + 'plugins/webplugin_2d_device_delegate.cc', + 'plugins/webplugin_2d_device_delegate.h', + 'plugins/webplugin_3d_device_delegate.cc', + 'plugins/webplugin_3d_device_delegate.h', + 'plugins/webplugin_accelerated_surface_mac.h', + 'plugins/webplugin_delegate.cc', + 'plugins/webplugin_delegate.h', + 'plugins/webplugin_delegate_impl.cc', + 'plugins/webplugin_delegate_impl.h', + 'plugins/webplugin_delegate_impl_gtk.cc', + 'plugins/webplugin_delegate_impl_mac.mm', + 'plugins/webplugin_delegate_impl_win.cc', + 'plugins/webplugin_file_delegate.cc', + 'plugins/webplugin_file_delegate.h', + 'plugins/webplugin_impl.cc', + 'plugins/webplugin_impl.h', + 'plugins/webplugin_print_delegate.cc', + 'plugins/webplugin_print_delegate.h', + 'plugins/webplugininfo.cc', + 'plugins/webplugininfo.h', 'alt_error_page_resource_fetcher.cc', 'alt_error_page_resource_fetcher.h', 'context_menu.cc', diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index 38ea659..fbb541a 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -23,6 +23,7 @@ class GURL; class SkBitmap; +struct WebPluginInfo; namespace base { class StringPiece; @@ -38,12 +39,6 @@ class WebString; class WebView; } -namespace webkit { -namespace npapi { -struct WebPluginInfo; -} -} - namespace webkit_glue { @@ -230,8 +225,7 @@ bool GetApplicationDirectory(FilePath* path); bool GetExeDirectory(FilePath* path); // Embedders implement this function to return the list of plugins to Webkit. -void GetPlugins(bool refresh, - std::vector<webkit::npapi::WebPluginInfo>* plugins); +void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins); // Returns true if the plugins run in the same process as the renderer, and // false otherwise. diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index 844aae7..5346181 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -35,8 +35,8 @@ #include "third_party/WebKit/WebKit/chromium/public/WebVector.h" #include "third_party/WebKit/WebKit/chromium/public/WebURL.h" #include "webkit/glue/media/audio_decoder.h" -#include "webkit/plugins/npapi/plugin_instance.h" -#include "webkit/plugins/npapi/webplugininfo.h" +#include "webkit/glue/plugins/plugin_instance.h" +#include "webkit/glue/plugins/webplugininfo.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/websocketstreamhandle_impl.h" #include "webkit/glue/weburlloader_impl.h" @@ -225,18 +225,18 @@ WebString WebKitClientImpl::userAgent(const WebURL& url) { void WebKitClientImpl::getPluginList(bool refresh, WebPluginListBuilder* builder) { - std::vector<webkit::npapi::WebPluginInfo> plugins; + std::vector<WebPluginInfo> plugins; GetPlugins(refresh, &plugins); for (size_t i = 0; i < plugins.size(); ++i) { - const webkit::npapi::WebPluginInfo& plugin = plugins[i]; + const WebPluginInfo& plugin = plugins[i]; builder->addPlugin( plugin.name, plugin.desc, FilePathStringToWebString(plugin.path.BaseName().value())); for (size_t j = 0; j < plugin.mime_types.size(); ++j) { - const webkit::npapi::WebPluginMimeType& mime_type = plugin.mime_types[j]; + const WebPluginMimeType& mime_type = plugin.mime_types[j]; builder->addMediaTypeToLastPlugin( WebString::fromUTF8(mime_type.mime_type), mime_type.description); diff --git a/webkit/plugins/npapi/test/npapi_constants.cc b/webkit/plugins/npapi/test/npapi_constants.cc index 94d3284..75cc68f 100644 --- a/webkit/plugins/npapi/test/npapi_constants.cc +++ b/webkit/plugins/npapi/test/npapi_constants.cc @@ -1,12 +1,10 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. -#include "webkit/plugins/npapi/test/npapi_constants.h" +#include "webkit/glue/plugins/test/npapi_constants.h" namespace NPAPIClient { - const char kTestCompleteCookie[] = "status"; const char kTestCompleteSuccess[] = "OK"; - -} // namespace NPAPIClient +} diff --git a/webkit/plugins/npapi/test/npapi_constants.h b/webkit/plugins/npapi/test/npapi_constants.h index 2d375b0..6570c35 100644 --- a/webkit/plugins/npapi/test/npapi_constants.h +++ b/webkit/plugins/npapi/test/npapi_constants.h @@ -1,14 +1,13 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. // Constants for the NPAPI test -#ifndef WEBKIT_PLUGINS_NPAPI_TEST_NPAPI_CONSTANTS_H_ -#define WEBKIT_PLUGINS_NPAPI_TEST_NPAPI_CONSTANTS_H_ +#ifndef WEBKIT_PORT_PLUGINS_TEST_NPAPI_CONSTANTS_H__ +#define WEBKIT_PORT_PLUGINS_TEST_NPAPI_CONSTANTS_H__ namespace NPAPIClient { - // The name of the cookie which will be used to communicate between // the plugin and the test harness. extern const char kTestCompleteCookie[]; @@ -16,7 +15,5 @@ extern const char kTestCompleteCookie[]; // The cookie value which will be sent to the client upon successful // test. extern const char kTestCompleteSuccess[]; - -} // namespace NPAPIClient - -#endif // WEBKIT_PLUGINS_NPAPI_TEST_NPAPI_CONSTANTS_H_ +} +#endif // WEBKIT_PORT_PLUGINS_TEST_NPAPI_CONSTANTS_H__ diff --git a/webkit/plugins/npapi/test/npapi_test.cc b/webkit/plugins/npapi/test/npapi_test.cc index 26dc45d..895a842 100644 --- a/webkit/plugins/npapi/test/npapi_test.cc +++ b/webkit/plugins/npapi/test/npapi_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. @@ -53,7 +53,7 @@ #define EXPORT #endif -#include "webkit/plugins/npapi/test/plugin_client.h" +#include "webkit/glue/plugins/test/plugin_client.h" #if defined(OS_WIN) BOOL API_CALL DllMain(HINSTANCE hDll, DWORD dwReason, LPVOID lpReserved) { diff --git a/webkit/plugins/npapi/test/plugin_arguments_test.cc b/webkit/plugins/npapi/test/plugin_arguments_test.cc index fe1e54e..46ccf43 100644 --- a/webkit/plugins/npapi/test/plugin_arguments_test.cc +++ b/webkit/plugins/npapi/test/plugin_arguments_test.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 "webkit/plugins/npapi/test/plugin_arguments_test.h" - #include "base/basictypes.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "webkit/glue/plugins/test/plugin_arguments_test.h" + namespace NPAPIClient { PluginArgumentsTest::PluginArgumentsTest(NPP id, @@ -66,4 +66,4 @@ NPError PluginArgumentsTest::SetWindow(NPWindow* pNPWindow) { return NPERR_NO_ERROR; } -} // namespace NPAPIClient +} // namespace NPAPIClient diff --git a/webkit/plugins/npapi/test/plugin_arguments_test.h b/webkit/plugins/npapi/test/plugin_arguments_test.h index c2a0eaa..aa05f19 100644 --- a/webkit/plugins/npapi/test/plugin_arguments_test.h +++ b/webkit/plugins/npapi/test/plugin_arguments_test.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. -#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_ARGUMENTS_TEST_H_ -#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_ARGUMENTS_TEST_H_ +#ifndef WEBKIT_PORT_PLUGINS_TEST_PLUGIN_ARGUMENTS_TEST_H__ +#define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_ARGUMENTS_TEST_H__ -#include "webkit/plugins/npapi/test/plugin_test.h" +#include "webkit/glue/plugins/test/plugin_test.h" namespace NPAPIClient { @@ -38,6 +38,6 @@ class PluginArgumentsTest : public PluginTest { virtual NPError SetWindow(NPWindow* pNPWindow); }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_ARGUMENTS_TEST_H_ +#endif // WEBKIT_PORT_PLUGINS_TEST_PLUGIN_ARGUMENTS_TEST_H__ diff --git a/webkit/plugins/npapi/test/plugin_client.cc b/webkit/plugins/npapi/test/plugin_client.cc index 0b28250..8358340 100644 --- a/webkit/plugins/npapi/test/plugin_client.cc +++ b/webkit/plugins/npapi/test/plugin_client.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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. -#include "webkit/plugins/npapi/test/plugin_client.h" +#include "webkit/glue/plugins/test/plugin_client.h" #include "base/string_util.h" -#include "webkit/plugins/npapi/test/plugin_test.h" -#include "webkit/plugins/npapi/test/plugin_test_factory.h" +#include "webkit/glue/plugins/test/plugin_test.h" +#include "webkit/glue/plugins/test/plugin_test_factory.h" namespace NPAPIClient { diff --git a/webkit/plugins/npapi/test/plugin_client.h b/webkit/plugins/npapi/test/plugin_client.h index c06be2d..a6291b0 100644 --- a/webkit/plugins/npapi/test/plugin_client.h +++ b/webkit/plugins/npapi/test/plugin_client.h @@ -1,9 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. -#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CLIENT_H_ -#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CLIENT_H_ +#ifndef WEBKIT_PORT_PLUGINS_TEST_PLUGIN_CLIENT_H__ +#define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_CLIENT_H__ #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/nphostapi.h" @@ -40,6 +40,6 @@ class PluginClient { static NPNetscapeFuncs* host_functions_; }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CLIENT_H_ +#endif // WEBKIT_PORT_PLUGINS_TEST_PLUGIN_CLIENT_H__ diff --git a/webkit/plugins/npapi/test/plugin_create_instance_in_paint.cc b/webkit/plugins/npapi/test/plugin_create_instance_in_paint.cc index 09d6bdc..f98f89b 100644 --- a/webkit/plugins/npapi/test/plugin_create_instance_in_paint.cc +++ b/webkit/plugins/npapi/test/plugin_create_instance_in_paint.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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. -#include "webkit/plugins/npapi/test/plugin_create_instance_in_paint.h" +#include "webkit/glue/plugins/test/plugin_create_instance_in_paint.h" -#include "webkit/plugins/npapi/test/plugin_client.h" +#include "webkit/glue/plugins/test/plugin_client.h" namespace NPAPIClient { diff --git a/webkit/plugins/npapi/test/plugin_create_instance_in_paint.h b/webkit/plugins/npapi/test/plugin_create_instance_in_paint.h index 59f196f..84d7a94 100644 --- a/webkit/plugins/npapi/test/plugin_create_instance_in_paint.h +++ b/webkit/plugins/npapi/test/plugin_create_instance_in_paint.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H_ -#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H_ +#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H +#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H -#include "webkit/plugins/npapi/test/plugin_test.h" +#include "webkit/glue/plugins/test/plugin_test.h" namespace NPAPIClient { @@ -28,6 +28,6 @@ class CreateInstanceInPaintTest : public PluginTest { bool created_; }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H_ +#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H diff --git a/webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.cc b/webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.cc index fad7992..15318b4 100644 --- a/webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.cc +++ b/webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. -#include "webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.h" +#include "webkit/glue/plugins/test/plugin_delete_plugin_in_stream_test.h" -#include "webkit/plugins/npapi/test/plugin_client.h" +#include "webkit/glue/plugins/test/plugin_client.h" namespace NPAPIClient { diff --git a/webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.h b/webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.h index dca9de3..418e976 100644 --- a/webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.h +++ b/webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. -#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H_ -#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H_ +#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H +#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H -#include "webkit/plugins/npapi/test/plugin_test.h" +#include "webkit/glue/plugins/test/plugin_test.h" namespace NPAPIClient { @@ -25,6 +25,6 @@ class DeletePluginInStreamTest : public PluginTest { std::string self_url_; }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H_ +#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H diff --git a/webkit/plugins/npapi/test/plugin_get_javascript_url2_test.cc b/webkit/plugins/npapi/test/plugin_get_javascript_url2_test.cc index e7595f2..d17dced 100644 --- a/webkit/plugins/npapi/test/plugin_get_javascript_url2_test.cc +++ b/webkit/plugins/npapi/test/plugin_get_javascript_url2_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2009 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. -#include "webkit/plugins/npapi/test/plugin_get_javascript_url2_test.h" +#include "webkit/glue/plugins/test/plugin_get_javascript_url2_test.h" #include "base/basictypes.h" diff --git a/webkit/plugins/npapi/test/plugin_get_javascript_url2_test.h b/webkit/plugins/npapi/test/plugin_get_javascript_url2_test.h index b5c398e..557da76 100644 --- a/webkit/plugins/npapi/test/plugin_get_javascript_url2_test.h +++ b/webkit/plugins/npapi/test/plugin_get_javascript_url2_test.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. -#ifndef WEBKIT_PLUGINS_NPAPI_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL2_H_ -#define WEBKIT_PLUGINS_NPAPI_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL2_H_ +#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL2_H +#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL2_H -#include "webkit/plugins/npapi/test/plugin_test.h" +#include "webkit/glue/plugins/test/plugin_test.h" namespace NPAPIClient { @@ -33,6 +33,6 @@ class ExecuteGetJavascriptUrl2Test : public PluginTest { std::string self_url_; }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_PLUGINS_NPAPI_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL2_H_ +#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL2_H diff --git a/webkit/plugins/npapi/test/plugin_get_javascript_url_test.cc b/webkit/plugins/npapi/test/plugin_get_javascript_url_test.cc index ea32fac..50f5e5a 100644 --- a/webkit/plugins/npapi/test/plugin_get_javascript_url_test.cc +++ b/webkit/plugins/npapi/test/plugin_get_javascript_url_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. -#include "webkit/plugins/npapi/test/plugin_get_javascript_url_test.h" +#include "webkit/glue/plugins/test/plugin_get_javascript_url_test.h" #include "base/basictypes.h" diff --git a/webkit/plugins/npapi/test/plugin_get_javascript_url_test.h b/webkit/plugins/npapi/test/plugin_get_javascript_url_test.h index 9aab3f9..5c2540d 100644 --- a/webkit/plugins/npapi/test/plugin_get_javascript_url_test.h +++ b/webkit/plugins/npapi/test/plugin_get_javascript_url_test.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. -#ifndef WEBKIT_PLUGINS_NPAPI_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL_H_ -#define WEBKIT_PLUGINS_NPAPI_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL_H_ +#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL_H +#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL_H -#include "webkit/plugins/npapi/test/plugin_test.h" +#include "webkit/glue/plugins/test/plugin_test.h" namespace NPAPIClient { @@ -42,6 +42,6 @@ class ExecuteGetJavascriptUrlTest : public PluginTest { #endif }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_PLUGINS_NPAPI_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL_H_ +#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL_H diff --git a/webkit/plugins/npapi/test/plugin_geturl_test.cc b/webkit/plugins/npapi/test/plugin_geturl_test.cc index 850a0b5..5363a66 100644 --- a/webkit/plugins/npapi/test/plugin_geturl_test.cc +++ b/webkit/plugins/npapi/test/plugin_geturl_test.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 "webkit/plugins/npapi/test/plugin_geturl_test.h" +#include "webkit/glue/plugins/test/plugin_geturl_test.h" #include <stdio.h> diff --git a/webkit/plugins/npapi/test/plugin_geturl_test.h b/webkit/plugins/npapi/test/plugin_geturl_test.h index 79c623b..df8d741 100644 --- a/webkit/plugins/npapi/test/plugin_geturl_test.h +++ b/webkit/plugins/npapi/test/plugin_geturl_test.h @@ -1,13 +1,13 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. -#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_GETURL_TEST_H_ -#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_GETURL_TEST_H_ +#ifndef WEBKIT_PORT_PLUGINS_TEST_PLUGIN_GETURL_TEST_H__ +#define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_GETURL_TEST_H__ #include <stdio.h> -#include "webkit/plugins/npapi/test/plugin_test.h" +#include "webkit/glue/plugins/test/plugin_test.h" namespace NPAPIClient { @@ -56,6 +56,6 @@ class PluginGetURLTest : public PluginTest { std::string referrer_target_url_; }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_GETURL_TEST_H_ +#endif // WEBKIT_PORT_PLUGINS_TEST_PLUGIN_GETURL_TEST_H__ diff --git a/webkit/plugins/npapi/test/plugin_javascript_open_popup.cc b/webkit/plugins/npapi/test/plugin_javascript_open_popup.cc index 583a55e..0f93bf4 100644 --- a/webkit/plugins/npapi/test/plugin_javascript_open_popup.cc +++ b/webkit/plugins/npapi/test/plugin_javascript_open_popup.cc @@ -1,14 +1,14 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. #include "build/build_config.h" -#include "webkit/plugins/npapi/test/plugin_javascript_open_popup.h" +#include "webkit/glue/plugins/test/plugin_javascript_open_popup.h" #if defined(USE_X11) #include "third_party/npapi/bindings/npapi_x11.h" #endif -#include "webkit/plugins/npapi/test/plugin_client.h" +#include "webkit/glue/plugins/test/plugin_client.h" namespace NPAPIClient { diff --git a/webkit/plugins/npapi/test/plugin_javascript_open_popup.h b/webkit/plugins/npapi/test/plugin_javascript_open_popup.h index 6381d25..552397a 100644 --- a/webkit/plugins/npapi/test/plugin_javascript_open_popup.h +++ b/webkit/plugins/npapi/test/plugin_javascript_open_popup.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. -#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H_ -#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H_ +#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H +#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H -#include "webkit/plugins/npapi/test/plugin_test.h" +#include "webkit/glue/plugins/test/plugin_test.h" namespace NPAPIClient { @@ -42,6 +42,6 @@ class ExecuteJavascriptPopupWindowTargetPluginTest : public PluginTest { bool test_completed_; }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H_ +#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H diff --git a/webkit/plugins/npapi/test/plugin_new_fails_test.cc b/webkit/plugins/npapi/test/plugin_new_fails_test.cc index 71cff01..2feeec6 100644 --- a/webkit/plugins/npapi/test/plugin_new_fails_test.cc +++ b/webkit/plugins/npapi/test/plugin_new_fails_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. -#include "webkit/plugins/npapi/test/plugin_new_fails_test.h" +#include "webkit/glue/plugins/test/plugin_new_fails_test.h" namespace NPAPIClient { @@ -15,4 +15,4 @@ NPError NewFailsTest::New(uint16 mode, int16 argc, const char* argn[], return NPERR_GENERIC_ERROR; } -} // namespace NPAPIClient +} // namespace NPAPIClient diff --git a/webkit/plugins/npapi/test/plugin_new_fails_test.h b/webkit/plugins/npapi/test/plugin_new_fails_test.h index 334323e..1acf9e5 100644 --- a/webkit/plugins/npapi/test/plugin_new_fails_test.h +++ b/webkit/plugins/npapi/test/plugin_new_fails_test.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. -#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_PLUGIN_NEW_FAILS_TEST_H_ -#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_PLUGIN_NEW_FAILS_TEST_H_ +#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_PLUGIN_NEW_FAILS_TEST_H__ +#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_PLUGIN_NEW_FAILS_TEST_H__ -#include "webkit/plugins/npapi/test/plugin_test.h" +#include "webkit/glue/plugins/test/plugin_test.h" namespace NPAPIClient { @@ -16,6 +16,6 @@ class NewFailsTest : public PluginTest { const char* argv[], NPSavedData* saved); }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_PLUGIN_NPP_NEW_FAILS_TEST_H_ +#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_PLUGIN_NPP_NEW_FAILS_TEST_H__ diff --git a/webkit/plugins/npapi/test/plugin_npobject_lifetime_test.cc b/webkit/plugins/npapi/test/plugin_npobject_lifetime_test.cc index f493238..4564506 100644 --- a/webkit/plugins/npapi/test/plugin_npobject_lifetime_test.cc +++ b/webkit/plugins/npapi/test/plugin_npobject_lifetime_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. -#include "webkit/plugins/npapi/test/plugin_npobject_lifetime_test.h" +#include "webkit/glue/plugins/test/plugin_npobject_lifetime_test.h" namespace NPAPIClient { diff --git a/webkit/plugins/npapi/test/plugin_npobject_lifetime_test.h b/webkit/plugins/npapi/test/plugin_npobject_lifetime_test.h index 12cf4e2..60d0314 100644 --- a/webkit/plugins/npapi/test/plugin_npobject_lifetime_test.h +++ b/webkit/plugins/npapi/test/plugin_npobject_lifetime_test.h @@ -1,12 +1,12 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. -#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_LIFETIME_TEST_H_ -#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_LIFETIME_TEST_H_ +#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_NPOBJECT_LIFETIME_TEST_H__ +#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_NPOBJECT_LIFETIME_TEST_H__ #include "build/build_config.h" -#include "webkit/plugins/npapi/test/plugin_test.h" +#include "webkit/glue/plugins/test/plugin_test.h" namespace NPAPIClient { @@ -77,6 +77,6 @@ class NPObjectDeletePluginInNPN_Evaluate : public PluginTest { DISALLOW_IMPLICIT_CONSTRUCTORS(NPObjectDeletePluginInNPN_Evaluate); }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_LIFETIME_TEST_H_ +#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_NPOBJECT_LIFETIME_TEST_H__ diff --git a/webkit/plugins/npapi/test/plugin_npobject_proxy_test.cc b/webkit/plugins/npapi/test/plugin_npobject_proxy_test.cc index c9cd27f..5b3a2ca 100644 --- a/webkit/plugins/npapi/test/plugin_npobject_proxy_test.cc +++ b/webkit/plugins/npapi/test/plugin_npobject_proxy_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. @@ -9,7 +9,7 @@ #define STRSAFE_NO_DEPRECATE #include <strsafe.h> #endif -#include "webkit/plugins/npapi/test/plugin_npobject_proxy_test.h" +#include "webkit/glue/plugins/test/plugin_npobject_proxy_test.h" namespace NPAPIClient { diff --git a/webkit/plugins/npapi/test/plugin_npobject_proxy_test.h b/webkit/plugins/npapi/test/plugin_npobject_proxy_test.h index 8585d0f..3d14ddb 100644 --- a/webkit/plugins/npapi/test/plugin_npobject_proxy_test.h +++ b/webkit/plugins/npapi/test/plugin_npobject_proxy_test.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. -#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_PROXY_TEST_H_ -#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_PROXY_TEST_H_ +#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_NPOBJECT_PROXY_TEST_H__ +#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_NPOBJECT_PROXY_TEST_H__ -#include "webkit/plugins/npapi/test/plugin_test.h" +#include "webkit/glue/plugins/test/plugin_test.h" namespace NPAPIClient { @@ -22,6 +22,6 @@ class NPObjectProxyTest : public PluginTest { virtual NPError SetWindow(NPWindow* pNPWindow); }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_PROXY_TEST_H_ +#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_NPOBJECT_PROXY_TEST_H__ diff --git a/webkit/plugins/npapi/test/plugin_private_test.cc b/webkit/plugins/npapi/test/plugin_private_test.cc index b3aabce..cdab7ce 100644 --- a/webkit/plugins/npapi/test/plugin_private_test.cc +++ b/webkit/plugins/npapi/test/plugin_private_test.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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. -#include "webkit/plugins/npapi/test/plugin_private_test.h" +#include "webkit/glue/plugins/test/plugin_private_test.h" #include "base/basictypes.h" #include "base/string_util.h" -#include "webkit/plugins/npapi/test/plugin_client.h" +#include "webkit/glue/plugins/test/plugin_client.h" namespace NPAPIClient { diff --git a/webkit/plugins/npapi/test/plugin_private_test.h b/webkit/plugins/npapi/test/plugin_private_test.h index 9079a11..db6b5d1 100644 --- a/webkit/plugins/npapi/test/plugin_private_test.h +++ b/webkit/plugins/npapi/test/plugin_private_test.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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. -#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_PRIVATE_TEST_H_ -#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_PRIVATE_TEST_H_ +#ifndef WEBKIT_PORT_PLUGINS_TEST_PLUGIN_PRIVATE_TEST_H_ +#define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_PRIVATE_TEST_H_ -#include "webkit/plugins/npapi/test/plugin_test.h" +#include "webkit/glue/plugins/test/plugin_test.h" namespace NPAPIClient { @@ -20,6 +20,6 @@ class PrivateTest : public PluginTest { const char* argv[], NPSavedData* saved); }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_PRIVATE_TEST_H_ +#endif // WEBKIT_PORT_PLUGINS_TEST_PLUGIN_PRIVATE_TEST_H_ diff --git a/webkit/plugins/npapi/test/plugin_schedule_timer_test.cc b/webkit/plugins/npapi/test/plugin_schedule_timer_test.cc index 831ab29..fbfce34 100644 --- a/webkit/plugins/npapi/test/plugin_schedule_timer_test.cc +++ b/webkit/plugins/npapi/test/plugin_schedule_timer_test.cc @@ -1,9 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. -#include "webkit/plugins/npapi/test/plugin_schedule_timer_test.h" -#include "webkit/plugins/npapi/test/plugin_client.h" +#include "webkit/glue/plugins/test/plugin_schedule_timer_test.h" +#include "webkit/glue/plugins/test/plugin_client.h" using base::Time; diff --git a/webkit/plugins/npapi/test/plugin_schedule_timer_test.h b/webkit/plugins/npapi/test/plugin_schedule_timer_test.h index 043672c..e3e6505a 100644 --- a/webkit/plugins/npapi/test/plugin_schedule_timer_test.h +++ b/webkit/plugins/npapi/test/plugin_schedule_timer_test.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_SCHEDULE_TIMER_TEST_H -#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_SCHEDULE_TIMER_TEST_H +#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_SCHEDULE_TIMER_TEST_H +#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_SCHEDULE_TIMER_TEST_H #include "base/at_exit.h" #include "base/time.h" -#include "webkit/plugins/npapi/test/plugin_test.h" +#include "webkit/glue/plugins/test/plugin_test.h" namespace NPAPIClient { @@ -65,4 +65,4 @@ class ScheduleTimerTest : public PluginTest { } // namespace NPAPIClient -#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_SCHEDULE_TIMER_TEST_H +#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_SCHEDULE_TIMER_TEST_H diff --git a/webkit/plugins/npapi/test/plugin_setup_test.cc b/webkit/plugins/npapi/test/plugin_setup_test.cc index ded1379..e4c4903 100644 --- a/webkit/plugins/npapi/test/plugin_setup_test.cc +++ b/webkit/plugins/npapi/test/plugin_setup_test.cc @@ -5,7 +5,7 @@ #include "base/basictypes.h" #include "base/string_util.h" -#include "webkit/plugins/npapi/test/plugin_setup_test.h" +#include "webkit/glue/plugins/test/plugin_setup_test.h" namespace NPAPIClient { @@ -19,4 +19,4 @@ NPError PluginSetupTest::SetWindow(NPWindow* pNPWindow) { return NPERR_NO_ERROR; } -} // namespace NPAPIClient +} // namespace NPAPIClient diff --git a/webkit/plugins/npapi/test/plugin_setup_test.h b/webkit/plugins/npapi/test/plugin_setup_test.h index 709b3b1..b01bc42 100644 --- a/webkit/plugins/npapi/test/plugin_setup_test.h +++ b/webkit/plugins/npapi/test/plugin_setup_test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_SETUP_TEST_H_ -#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_SETUP_TEST_H_ +#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_SETUP_TEST_H__ +#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_SETUP_TEST_H__ -#include "webkit/plugins/npapi/test/plugin_test.h" +#include "webkit/glue/plugins/test/plugin_test.h" namespace NPAPIClient { @@ -19,6 +19,6 @@ class PluginSetupTest : public PluginTest { virtual NPError SetWindow(NPWindow* pNPWindow); }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_SETUP_TEST_H_ +#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_SETUP_TEST_H__ diff --git a/webkit/plugins/npapi/test/plugin_test.cc b/webkit/plugins/npapi/test/plugin_test.cc index c948010..6717e4b 100644 --- a/webkit/plugins/npapi/test/plugin_test.cc +++ b/webkit/plugins/npapi/test/plugin_test.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. -#include "webkit/plugins/npapi/test/plugin_test.h" +#include "webkit/glue/plugins/test/plugin_test.h" #include "base/string_util.h" -#include "webkit/plugins/npapi/test/npapi_constants.h" +#include "webkit/glue/plugins/test/npapi_constants.h" namespace NPAPIClient { diff --git a/webkit/plugins/npapi/test/plugin_test.h b/webkit/plugins/npapi/test/plugin_test.h index fee09d3..f3f8937 100644 --- a/webkit/plugins/npapi/test/plugin_test.h +++ b/webkit/plugins/npapi/test/plugin_test.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_H_ -#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_H_ +#ifndef WEBKIT_PORT_PLUGINS_TEST_PLUGIN_TEST_H_ +#define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_TEST_H_ #include <string> @@ -129,6 +129,6 @@ class PluginTest { bool test_completed_; }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_H_ +#endif // WEBKIT_PORT_PLUGINS_TEST_PLUGIN_TEST_H_ diff --git a/webkit/plugins/npapi/test/plugin_test_factory.cc b/webkit/plugins/npapi/test/plugin_test_factory.cc index 779ad00..b4ae4f1 100644 --- a/webkit/plugins/npapi/test/plugin_test_factory.cc +++ b/webkit/plugins/npapi/test/plugin_test_factory.cc @@ -2,26 +2,26 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/plugins/npapi/test/plugin_test_factory.h" +#include "webkit/glue/plugins/test/plugin_test_factory.h" -#include "webkit/plugins/npapi/test/plugin_arguments_test.h" -#include "webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.h" -#include "webkit/plugins/npapi/test/plugin_get_javascript_url_test.h" -#include "webkit/plugins/npapi/test/plugin_get_javascript_url2_test.h" -#include "webkit/plugins/npapi/test/plugin_geturl_test.h" -#include "webkit/plugins/npapi/test/plugin_javascript_open_popup.h" -#include "webkit/plugins/npapi/test/plugin_new_fails_test.h" -#include "webkit/plugins/npapi/test/plugin_npobject_lifetime_test.h" -#include "webkit/plugins/npapi/test/plugin_npobject_proxy_test.h" -#include "webkit/plugins/npapi/test/plugin_private_test.h" -#include "webkit/plugins/npapi/test/plugin_schedule_timer_test.h" -#include "webkit/plugins/npapi/test/plugin_setup_test.h" -#include "webkit/plugins/npapi/test/plugin_thread_async_call_test.h" -#include "webkit/plugins/npapi/test/plugin_window_size_test.h" +#include "webkit/glue/plugins/test/plugin_arguments_test.h" +#include "webkit/glue/plugins/test/plugin_delete_plugin_in_stream_test.h" +#include "webkit/glue/plugins/test/plugin_get_javascript_url_test.h" +#include "webkit/glue/plugins/test/plugin_get_javascript_url2_test.h" +#include "webkit/glue/plugins/test/plugin_geturl_test.h" +#include "webkit/glue/plugins/test/plugin_javascript_open_popup.h" +#include "webkit/glue/plugins/test/plugin_new_fails_test.h" +#include "webkit/glue/plugins/test/plugin_npobject_lifetime_test.h" +#include "webkit/glue/plugins/test/plugin_npobject_proxy_test.h" +#include "webkit/glue/plugins/test/plugin_private_test.h" +#include "webkit/glue/plugins/test/plugin_schedule_timer_test.h" +#include "webkit/glue/plugins/test/plugin_setup_test.h" +#include "webkit/glue/plugins/test/plugin_thread_async_call_test.h" +#include "webkit/glue/plugins/test/plugin_window_size_test.h" #if defined(OS_WIN) -#include "webkit/plugins/npapi/test/plugin_windowed_test.h" +#include "webkit/glue/plugins/test/plugin_windowed_test.h" #endif -#include "webkit/plugins/npapi/test/plugin_windowless_test.h" +#include "webkit/glue/plugins/test/plugin_windowless_test.h" namespace NPAPIClient { diff --git a/webkit/plugins/npapi/test/plugin_test_factory.h b/webkit/plugins/npapi/test/plugin_test_factory.h index f1ed661..3fd38d5 100644 --- a/webkit/plugins/npapi/test/plugin_test_factory.h +++ b/webkit/plugins/npapi/test/plugin_test_factory.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_FACTROY_H__ -#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_FACTROY_H__ +#ifndef WEBKIT_PORT_PLUGINS_TEST_PLUGIN_TEST_FACTROY_H__ +#define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_TEST_FACTROY_H__ #include <string> @@ -19,4 +19,4 @@ extern PluginTest* CreatePluginTest(const std::string& test_name, } // namespace NPAPIClient -#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_FACTROY_H__ +#endif // WEBKIT_PORT_PLUGINS_TEST_PLUGIN_TEST_FACTROY_H__ diff --git a/webkit/plugins/npapi/test/plugin_thread_async_call_test.cc b/webkit/plugins/npapi/test/plugin_thread_async_call_test.cc index e28f84e..c01a49e 100644 --- a/webkit/plugins/npapi/test/plugin_thread_async_call_test.cc +++ b/webkit/plugins/npapi/test/plugin_thread_async_call_test.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 "webkit/plugins/npapi/test/plugin_thread_async_call_test.h" +#include "webkit/glue/plugins/test/plugin_thread_async_call_test.h" #include "base/at_exit.h" #include "base/message_loop.h" #include "base/thread.h" -#include "webkit/plugins/npapi/test/plugin_client.h" +#include "webkit/glue/plugins/test/plugin_client.h" namespace NPAPIClient { diff --git a/webkit/plugins/npapi/test/plugin_thread_async_call_test.h b/webkit/plugins/npapi/test/plugin_thread_async_call_test.h index 9e6a011..78e4e8d 100644 --- a/webkit/plugins/npapi/test/plugin_thread_async_call_test.h +++ b/webkit/plugins/npapi/test/plugin_thread_async_call_test.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_THREAD_ASYNC_CALL_TEST_H_ -#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_THREAD_ASYNC_CALL_TEST_H_ +#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_THREAD_ASYNC_CALL_TEST_H_ +#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_THREAD_ASYNC_CALL_TEST_H_ #include "base/scoped_ptr.h" -#include "webkit/plugins/npapi/test/plugin_test.h" +#include "webkit/glue/plugins/test/plugin_test.h" namespace base { class AtExitManager; @@ -36,4 +36,4 @@ class PluginThreadAsyncCallTest : public PluginTest { } // namespace NPAPIClient -#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_THREAD_ASYNC_CALL_TEST_H_ +#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_THREAD_ASYNC_CALL_TEST_H_ diff --git a/webkit/plugins/npapi/test/plugin_window_size_test.cc b/webkit/plugins/npapi/test/plugin_window_size_test.cc index abc08ad..9bfabca 100644 --- a/webkit/plugins/npapi/test/plugin_window_size_test.cc +++ b/webkit/plugins/npapi/test/plugin_window_size_test.cc @@ -1,9 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. -#include "webkit/plugins/npapi/test/plugin_window_size_test.h" -#include "webkit/plugins/npapi/test/plugin_client.h" +#include "webkit/glue/plugins/test/plugin_window_size_test.h" +#include "webkit/glue/plugins/test/plugin_client.h" namespace NPAPIClient { diff --git a/webkit/plugins/npapi/test/plugin_window_size_test.h b/webkit/plugins/npapi/test/plugin_window_size_test.h index 5a49479..3650671 100644 --- a/webkit/plugins/npapi/test/plugin_window_size_test.h +++ b/webkit/plugins/npapi/test/plugin_window_size_test.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. -#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_WINDOW_SIZE_TEST_H_ -#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_WINDOW_SIZE_TEST_H_ +#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_WINDOW_SIZE_TEST_H +#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_WINDOW_SIZE_TEST_H -#include "webkit/plugins/npapi/test/plugin_test.h" +#include "webkit/glue/plugins/test/plugin_test.h" namespace NPAPIClient { @@ -19,6 +19,6 @@ class PluginWindowSizeTest : public PluginTest { virtual NPError SetWindow(NPWindow* pNPWindow); }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_WINDOW_SIZE_TEST_H_ +#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_WINDOW_SIZE_TEST_H diff --git a/webkit/plugins/npapi/test/plugin_windowed_test.cc b/webkit/plugins/npapi/test/plugin_windowed_test.cc index 5635ec5..c82aa55 100644 --- a/webkit/plugins/npapi/test/plugin_windowed_test.cc +++ b/webkit/plugins/npapi/test/plugin_windowed_test.cc @@ -1,9 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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. -#include "webkit/plugins/npapi/test/plugin_windowed_test.h" -#include "webkit/plugins/npapi/test/plugin_client.h" +#include "webkit/glue/plugins/test/plugin_windowed_test.h" +#include "webkit/glue/plugins/test/plugin_client.h" namespace NPAPIClient { diff --git a/webkit/plugins/npapi/test/plugin_windowed_test.h b/webkit/plugins/npapi/test/plugin_windowed_test.h index 4906933..949ea86 100644 --- a/webkit/plugins/npapi/test/plugin_windowed_test.h +++ b/webkit/plugins/npapi/test/plugin_windowed_test.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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. -#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_WINDOWED_TEST_H -#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_WINDOWED_TEST_H +#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_WINDOWED_TEST_H +#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_WINDOWED_TEST_H -#include "webkit/plugins/npapi/test/plugin_test.h" +#include "webkit/glue/plugins/test/plugin_test.h" namespace NPAPIClient { @@ -28,6 +28,6 @@ class WindowedPluginTest : public PluginTest { bool done_; }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_WINDOWED_TEST_H +#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_WINDOWED_TEST_H diff --git a/webkit/plugins/npapi/test/plugin_windowless_test.cc b/webkit/plugins/npapi/test/plugin_windowless_test.cc index 17b9ca7..aa6a9d7 100644 --- a/webkit/plugins/npapi/test/plugin_windowless_test.cc +++ b/webkit/plugins/npapi/test/plugin_windowless_test.cc @@ -5,8 +5,8 @@ #define STRSAFE_NO_DEPRECATE #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "webkit/plugins/npapi/test/plugin_windowless_test.h" -#include "webkit/plugins/npapi/test/plugin_client.h" +#include "webkit/glue/plugins/test/plugin_windowless_test.h" +#include "webkit/glue/plugins/test/plugin_client.h" #if defined(OS_MACOSX) #include <ApplicationServices/ApplicationServices.h> diff --git a/webkit/plugins/npapi/test/plugin_windowless_test.h b/webkit/plugins/npapi/test/plugin_windowless_test.h index 6f5ce15..f336653 100644 --- a/webkit/plugins/npapi/test/plugin_windowless_test.h +++ b/webkit/plugins/npapi/test/plugin_windowless_test.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. -#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_EXECUTE_SCRIPT_DELETE_TEST_H_ -#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_EXECUTE_SCRIPT_DELETE_TEST_H_ +#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_EXECUTE_SCRIPT_DELETE_TEST_H +#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_EXECUTE_SCRIPT_DELETE_TEST_H -#include "webkit/plugins/npapi/test/plugin_test.h" +#include "webkit/glue/plugins/test/plugin_test.h" namespace NPAPIClient { @@ -30,6 +30,6 @@ class WindowlessPluginTest : public PluginTest { void ConvertPoint(NPNetscapeFuncs* browser); }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_EXECUTE_SCRIPT_DELETE_TEST_H_ +#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_EXECUTE_SCRIPT_DELETE_TEST_H diff --git a/webkit/plugins/npapi/test/resource.h b/webkit/plugins/npapi/test/resource.h index 422861f..c52fa82 100644 --- a/webkit/plugins/npapi/test/resource.h +++ b/webkit/plugins/npapi/test/resource.h @@ -4,7 +4,7 @@ // // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 101 diff --git a/webkit/plugins/plugin_switches.cc b/webkit/plugins/plugin_switches.cc index e37d416..be3342c 100644 --- a/webkit/plugins/plugin_switches.cc +++ b/webkit/plugins/plugin_switches.cc @@ -12,10 +12,4 @@ const char kEnablePepperTesting[] = "enable-pepper-testing"; // Dumps extra logging about plugin loading to the log file. const char kDebugPluginLoading[] = "debug-plugin-loading"; -#if defined(OS_WIN) -// Used by the plugins_test when testing the older WMP plugin to force the new -// plugin to not get loaded. -extern const char kUseOldWMPPlugin[] = "use-old-wmp"; -#endif - } // namespace switches diff --git a/webkit/plugins/plugin_switches.h b/webkit/plugins/plugin_switches.h index 8f5aa3c..7497ec1 100644 --- a/webkit/plugins/plugin_switches.h +++ b/webkit/plugins/plugin_switches.h @@ -5,17 +5,11 @@ #ifndef WEBKIT_PLUGINS_PLUGIN_SWITCHES_H_ #define WEBKIT_PLUGINS_PLUGIN_SWITCHES_H_ -#include "build/build_config.h" - namespace switches { extern const char kDebugPluginLoading[]; extern const char kEnablePepperTesting[]; -#if defined(OS_WIN) -extern const char kUseOldWMPPlugin[]; -#endif - } // namespace switches #endif // WEBKIT_PLUGINS_PLUGIN_SWITCHES_H_ diff --git a/webkit/plugins/ppapi/url_request_info_unittest.cc b/webkit/plugins/ppapi/url_request_info_unittest.cc deleted file mode 100644 index 341eeb2..0000000 --- a/webkit/plugins/ppapi/url_request_info_unittest.cc +++ /dev/null @@ -1,249 +0,0 @@ -// Copyright (c) 2010 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. - -#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/WebKit/chromium/public/WebFrameClient.h" -#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" -#include "third_party/WebKit/WebKit/chromium/public/WebView.h" - -#include "webkit/plugins/ppapi/ppapi_plugin_instance.h" -#include "webkit/plugins/ppapi/ppb_url_request_info_impl.h" -#include "webkit/plugins/ppapi/ppapi_unittest.h" - -using WebKit::WebCString; -using WebKit::WebFrame; -using WebKit::WebFrameClient; -using WebKit::WebString; -using WebKit::WebView; -using WebKit::WebURL; -using WebKit::WebURLRequest; - -namespace { - -bool IsExpected(const WebCString& web_string, const char* expected) { - const char* result = web_string.data(); - return strcmp(result, expected) == 0; -} - -bool IsExpected(const WebString& web_string, const char* expected) { - return IsExpected(web_string.utf8(), expected); -} - -bool IsNullOrEmpty(const WebString& web_string) { - return web_string.isNull() || web_string.isEmpty(); -} - -// The base class destructor is protected, so derive. -class TestWebFrameClient : public WebFrameClient { -}; - -} // namespace - -namespace webkit { -namespace ppapi { - -class URLRequestInfoTest : public PpapiUnittest { - public: - URLRequestInfoTest() : info_(new PPB_URLRequestInfo_Impl(module())) { - } - - static void SetUpTestCase() { - web_view_ = WebView::create(0, 0); - web_view_->initializeMainFrame(&web_frame_client_); - WebURL web_url(GURL("")); - WebURLRequest url_request; - url_request.initialize(); - url_request.setURL(web_url); - frame_ = web_view_->mainFrame(); - frame_->loadRequest(url_request); - } - - static void TearDownTestCase() { - web_view_->close(); - } - - bool GetDownloadToFile() { - WebURLRequest web_request = info_->ToWebURLRequest(frame_); - return web_request.downloadToFile(); - } - - WebCString GetURL() { - WebURLRequest web_request = info_->ToWebURLRequest(frame_); - return web_request.url().spec(); - } - - WebString GetMethod() { - WebURLRequest web_request = info_->ToWebURLRequest(frame_); - return web_request.httpMethod(); - } - - WebString GetHeaderValue(const char* field) { - WebURLRequest web_request = info_->ToWebURLRequest(frame_); - return web_request.httpHeaderField(WebString::fromUTF8(field)); - } - - scoped_refptr<PPB_URLRequestInfo_Impl> info_; - - static TestWebFrameClient web_frame_client_; - static WebView* web_view_; - static WebFrame* frame_; -}; - -TestWebFrameClient URLRequestInfoTest::web_frame_client_; -WebView* URLRequestInfoTest::web_view_; -WebFrame* URLRequestInfoTest::frame_; - -TEST_F(URLRequestInfoTest, GetInterface) { - const PPB_URLRequestInfo* interface = info_->GetInterface(); - ASSERT_TRUE(interface); - ASSERT_TRUE(interface->Create); - ASSERT_TRUE(interface->IsURLRequestInfo); - ASSERT_TRUE(interface->SetProperty); - ASSERT_TRUE(interface->AppendDataToBody); - ASSERT_TRUE(interface->AppendFileToBody); - ASSERT_TRUE(interface->Create); - ASSERT_TRUE(interface->Create); -} - -TEST_F(URLRequestInfoTest, AsURLRequestInfo) { - ASSERT_EQ(info_, info_->AsPPB_URLRequestInfo_Impl()); -} - -TEST_F(URLRequestInfoTest, StreamToFile) { - info_->SetStringProperty(PP_URLREQUESTPROPERTY_URL, "http://www.google.com"); - - ASSERT_FALSE(GetDownloadToFile()); - - ASSERT_TRUE(info_->SetBooleanProperty( - PP_URLREQUESTPROPERTY_STREAMTOFILE, true)); - ASSERT_TRUE(GetDownloadToFile()); - - ASSERT_TRUE(info_->SetBooleanProperty( - PP_URLREQUESTPROPERTY_STREAMTOFILE, false)); - ASSERT_FALSE(GetDownloadToFile()); -} - -TEST_F(URLRequestInfoTest, FollowRedirects) { - ASSERT_TRUE(info_->follow_redirects()); - - ASSERT_TRUE(info_->SetBooleanProperty( - PP_URLREQUESTPROPERTY_FOLLOWREDIRECTS, false)); - ASSERT_FALSE(info_->follow_redirects()); - - ASSERT_TRUE(info_->SetBooleanProperty( - PP_URLREQUESTPROPERTY_FOLLOWREDIRECTS, true)); - ASSERT_TRUE(info_->follow_redirects()); -} - -TEST_F(URLRequestInfoTest, RecordDownloadProgress) { - ASSERT_FALSE(info_->record_download_progress()); - - ASSERT_TRUE(info_->SetBooleanProperty( - PP_URLREQUESTPROPERTY_RECORDDOWNLOADPROGRESS, true)); - ASSERT_TRUE(info_->record_download_progress()); - - ASSERT_TRUE(info_->SetBooleanProperty( - PP_URLREQUESTPROPERTY_RECORDDOWNLOADPROGRESS, false)); - ASSERT_FALSE(info_->record_download_progress()); -} - -TEST_F(URLRequestInfoTest, RecordUploadProgress) { - ASSERT_FALSE(info_->record_upload_progress()); - - ASSERT_TRUE(info_->SetBooleanProperty( - PP_URLREQUESTPROPERTY_RECORDUPLOADPROGRESS, true)); - ASSERT_TRUE(info_->record_upload_progress()); - - ASSERT_TRUE(info_->SetBooleanProperty( - PP_URLREQUESTPROPERTY_RECORDUPLOADPROGRESS, false)); - ASSERT_FALSE(info_->record_upload_progress()); -} - -TEST_F(URLRequestInfoTest, SetURL) { - // Test default URL is "about:blank". - ASSERT_TRUE(IsExpected(GetURL(), "about:blank")); - - const char* url = "http://www.google.com/"; - ASSERT_TRUE(info_->SetStringProperty( - PP_URLREQUESTPROPERTY_URL, url)); - ASSERT_TRUE(IsExpected(GetURL(), url)); -} - -TEST_F(URLRequestInfoTest, SetMethod) { - // Test default method is "GET". - ASSERT_TRUE(IsExpected(GetMethod(), "GET")); - ASSERT_TRUE(info_->SetStringProperty( - PP_URLREQUESTPROPERTY_METHOD, "POST")); - ASSERT_TRUE(IsExpected(GetMethod(), "POST")); -} - -TEST_F(URLRequestInfoTest, SetValidHeaders) { - // Test default header field. - ASSERT_TRUE(IsExpected( - GetHeaderValue("foo"), "")); - // Test that we can set a header field. - ASSERT_TRUE(info_->SetStringProperty( - PP_URLREQUESTPROPERTY_HEADERS, "foo: bar")); - ASSERT_TRUE(IsExpected( - GetHeaderValue("foo"), "bar")); - // Test that we can set multiple header fields using \n delimiter. - ASSERT_TRUE(info_->SetStringProperty( - PP_URLREQUESTPROPERTY_HEADERS, "foo: bar\nbar: baz")); - ASSERT_TRUE(IsExpected( - GetHeaderValue("foo"), "bar")); - ASSERT_TRUE(IsExpected( - GetHeaderValue("bar"), "baz")); -} - -TEST_F(URLRequestInfoTest, SetInvalidHeaders) { - const char* const kForbiddenHeaderFields[] = { - "accept-charset", - "accept-encoding", - "connection", - "content-length", - "cookie", - "cookie2", - "content-transfer-encoding", - "date", - "expect", - "host", - "keep-alive", - "origin", - "referer", - "te", - "trailer", - "transfer-encoding", - "upgrade", - "user-agent", - "via", - - "proxy-foo", // Test for any header starting with proxy- or sec-. - "sec-foo", - }; - - // Test that no forbidden header fields can be set. - for (size_t i = 0; i < arraysize(kForbiddenHeaderFields); ++i) { - std::string headers(kForbiddenHeaderFields[i]); - headers.append(": foo"); - ASSERT_FALSE(info_->SetStringProperty( - PP_URLREQUESTPROPERTY_HEADERS, headers.c_str())); - ASSERT_TRUE(IsNullOrEmpty(GetHeaderValue(kForbiddenHeaderFields[i]))); - } - - // Test that forbidden header can't be set in various ways. - ASSERT_FALSE(info_->SetStringProperty( - PP_URLREQUESTPROPERTY_HEADERS, "cookie : foo")); - ASSERT_TRUE(IsNullOrEmpty(GetHeaderValue("cookie"))); - - // Test that forbidden header can't be set with an allowed one. - ASSERT_FALSE(info_->SetStringProperty( - PP_URLREQUESTPROPERTY_HEADERS, "foo: bar\ncookie: foo")); - ASSERT_TRUE(IsNullOrEmpty(GetHeaderValue("cookie"))); -} - -// TODO(bbudge) Unit tests for AppendDataToBody, AppendFileToBody. - -} // namespace ppapi -} // namespace webkit - diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm index 8ff15a7..7aeb80b 100644 --- a/webkit/support/platform_support_mac.mm +++ b/webkit/support/platform_support_mac.mm @@ -17,7 +17,7 @@ #include "base/string16.h" #include "grit/webkit_resources.h" #include "third_party/WebKit/WebKit/mac/WebCoreSupport/WebSystemInterface.h" -#include "webkit/plugins/npapi/plugin_list.h" +#include "webkit/glue/plugins/plugin_list.h" #import "webkit/support/drt_application_mac.h" #import "webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h" @@ -148,7 +148,7 @@ void AfterInitialize(bool unit_test_mode) { FilePath plugins_dir; PathService::Get(base::DIR_EXE, &plugins_dir); plugins_dir = plugins_dir.AppendASCII("../../../plugins"); - webkit::npapi::PluginList::Singleton()->AddExtraPluginDir(plugins_dir); + NPAPI::PluginList::Singleton()->AddExtraPluginDir(plugins_dir); } void BeforeShutdown() { diff --git a/webkit/support/test_webplugin_page_delegate.h b/webkit/support/test_webplugin_page_delegate.h index 1b4df88..95f2b4a 100644 --- a/webkit/support/test_webplugin_page_delegate.h +++ b/webkit/support/test_webplugin_page_delegate.h @@ -7,27 +7,26 @@ #include <string> -#include "webkit/plugins/npapi/webplugin_delegate_impl.h" -#include "webkit/plugins/npapi/webplugin_page_delegate.h" +#include "webkit/glue/plugins/webplugin_delegate_impl.h" +#include "webkit/glue/plugins/webplugin_page_delegate.h" namespace webkit_support { -class TestWebPluginPageDelegate : public webkit::npapi::WebPluginPageDelegate { +class TestWebPluginPageDelegate : public webkit_glue::WebPluginPageDelegate { public: TestWebPluginPageDelegate() {} virtual ~TestWebPluginPageDelegate() {} - virtual webkit::npapi::WebPluginDelegate* CreatePluginDelegate( + virtual webkit_glue::WebPluginDelegate* CreatePluginDelegate( const FilePath& file_path, const std::string& mime_type) { // We don't need a valid native window handle in layout tests. // So just passing 0. - return webkit::npapi::WebPluginDelegateImpl::Create( - file_path, mime_type, 0); + return WebPluginDelegateImpl::Create(file_path, mime_type, 0); } virtual void CreatedPluginWindow(gfx::PluginWindowHandle handle) {} virtual void WillDestroyPluginWindow(gfx::PluginWindowHandle handle) {} - virtual void DidMovePlugin(const webkit::npapi::WebPluginGeometry& move) {} + virtual void DidMovePlugin(const webkit_glue::WebPluginGeometry& move) {} virtual void DidStartLoadingForPlugin() {} virtual void DidStopLoadingForPlugin() {} virtual void ShowModalHTMLDialogForPlugin( @@ -41,5 +40,4 @@ class TestWebPluginPageDelegate : public webkit::npapi::WebPluginPageDelegate { }; } // namespace webkit_support - #endif // WEBKIT_SUPPORT_TEST_WEBPLUGIN_PAGE_DELEGATE_H_ diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index d088d3c..26ae930 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -35,13 +35,13 @@ #include "third_party/WebKit/WebKit/chromium/public/WebURLError.h" #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/glue/media/video_renderer_impl.h" +#include "webkit/glue/plugins/plugin_list.h" +#include "webkit/glue/plugins/webplugin_impl.h" +#include "webkit/glue/plugins/webplugin_page_delegate.h" +#include "webkit/glue/plugins/webplugininfo.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webkitclient_impl.h" #include "webkit/glue/webmediaplayer_impl.h" -#include "webkit/plugins/npapi/plugin_list.h" -#include "webkit/plugins/npapi/webplugin_impl.h" -#include "webkit/plugins/npapi/webplugin_page_delegate.h" -#include "webkit/plugins/npapi/webplugininfo.h" #include "webkit/support/platform_support.h" #include "webkit/support/test_webplugin_page_delegate.h" #include "webkit/support/test_webkit_client.h" @@ -145,14 +145,14 @@ class TestEnvironment { class WebPluginImplWithPageDelegate : public webkit_support::TestWebPluginPageDelegate, public base::SupportsWeakPtr<WebPluginImplWithPageDelegate>, - public webkit::npapi::WebPluginImpl { + public webkit_glue::WebPluginImpl { public: WebPluginImplWithPageDelegate(WebFrame* frame, const WebPluginParams& params, const FilePath& path, const std::string& mime_type) : webkit_support::TestWebPluginPageDelegate(), - webkit::npapi::WebPluginImpl( + webkit_glue::WebPluginImpl( frame, params, path, mime_type, AsWeakPtr()) {} virtual ~WebPluginImplWithPageDelegate() {} private: @@ -250,9 +250,9 @@ WebKit::WebKitClient* GetWebKitClient() { WebPlugin* CreateWebPlugin(WebFrame* frame, const WebPluginParams& params) { const bool kAllowWildcard = true; - webkit::npapi::WebPluginInfo info; + WebPluginInfo info; std::string actual_mime_type; - if (!webkit::npapi::PluginList::Singleton()->GetPluginInfo( + if (!NPAPI::PluginList::Singleton()->GetPluginInfo( params.url, params.mimeType.utf8(), kAllowWildcard, &info, &actual_mime_type) || !info.enabled) { return NULL; diff --git a/webkit/support/webkit_support_glue.cc b/webkit/support/webkit_support_glue.cc index 85d09db..2308a40 100644 --- a/webkit/support/webkit_support_glue.cc +++ b/webkit/support/webkit_support_glue.cc @@ -7,15 +7,14 @@ #include "base/base_paths.h" #include "base/path_service.h" #include "googleurl/src/gurl.h" -#include "webkit/plugins/npapi/plugin_list.h" +#include "webkit/glue/plugins/plugin_list.h" // Functions needed by webkit_glue. namespace webkit_glue { -void GetPlugins(bool refresh, - std::vector<webkit::npapi::WebPluginInfo>* plugins) { - webkit::npapi::PluginList::Singleton()->GetPlugins(refresh, plugins); +void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) { + NPAPI::PluginList::Singleton()->GetPlugins(refresh, plugins); // Don't load the forked npapi_layout_test_plugin in DRT, we only want to // use the upstream version TestNetscapePlugIn (on Mac, the upstream version // is named WebKitTestNetscapePlugIn). @@ -25,10 +24,10 @@ void GetPlugins(bool refresh, FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"), }; for (int i = plugins->size() - 1; i >= 0; --i) { - webkit::npapi::WebPluginInfo plugin_info = plugins->at(i); + WebPluginInfo plugin_info = plugins->at(i); for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { - webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path); + NPAPI::PluginList::Singleton()->DisablePlugin(plugin_info.path); plugins->erase(plugins->begin() + i); } } diff --git a/webkit/tools/test_shell/mac/test_webview_delegate.mm b/webkit/tools/test_shell/mac/test_webview_delegate.mm index bae33f1..b4e553d 100644 --- a/webkit/tools/test_shell/mac/test_webview_delegate.mm +++ b/webkit/tools/test_shell/mac/test_webview_delegate.mm @@ -11,9 +11,9 @@ #include "third_party/WebKit/WebKit/chromium/public/WebPopupMenu.h" #include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/webcursor.h" +#include "webkit/glue/plugins/plugin_list.h" +#include "webkit/glue/plugins/webplugin_delegate_impl.h" #include "webkit/glue/webmenurunner_mac.h" -#include "webkit/plugins/npapi/plugin_list.h" -#include "webkit/plugins/npapi/webplugin_delegate_impl.h" #include "webkit/tools/test_shell/test_shell.h" using WebKit::WebCursorInfo; @@ -168,7 +168,7 @@ void TestWebViewDelegate::runModal() { // WebPluginPageDelegate ------------------------------------------------------ -webkit::npapi::WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate( +webkit_glue::WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate( const FilePath& path, const std::string& mime_type) { WebWidgetHost *host = GetWidgetHost(); @@ -176,8 +176,7 @@ webkit::npapi::WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate( return NULL; gfx::PluginWindowHandle containing_view = NULL; - return webkit::npapi::WebPluginDelegateImpl::Create( - path, mime_type, containing_view); + return WebPluginDelegateImpl::Create(path, mime_type, containing_view); } void TestWebViewDelegate::CreatedPluginWindow( @@ -189,7 +188,7 @@ void TestWebViewDelegate::WillDestroyPluginWindow( } void TestWebViewDelegate::DidMovePlugin( - const webkit::npapi::WebPluginGeometry& move) { + const webkit_glue::WebPluginGeometry& move) { // TODO(port): add me once plugins work. } diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index 76f3c81..280be89 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -11,6 +11,9 @@ #include "base/debug_on_start.h" #include "base/file_path.h" #include "base/file_util.h" +#if defined(OS_MACOSX) +#include "base/mac_util.h" +#endif #include "base/md5.h" #include "base/message_loop.h" #include "base/metrics/stats_table.h" @@ -31,6 +34,9 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h" #include "third_party/WebKit/WebKit/chromium/public/WebDeviceOrientationClientMock.h" +#if defined(ENABLE_CLIENT_BASED_GEOLOCATION) +#include "third_party/WebKit/WebKit/chromium/public/WebGeolocationClientMock.h" +#endif #include "third_party/WebKit/WebKit/chromium/public/WebSpeechInputControllerMock.h" #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/WebKit/chromium/public/WebKit.h" @@ -43,10 +49,10 @@ #include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h" #include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/glue_serialize.h" +#include "webkit/glue/plugins/plugin_list.h" +#include "webkit/glue/plugins/webplugininfo.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" -#include "webkit/plugins/npapi/plugin_list.h" -#include "webkit/plugins/npapi/webplugininfo.h" #include "webkit/tools/test_shell/accessibility_controller.h" #include "webkit/tools/test_shell/notification_presenter.h" #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" @@ -57,14 +63,6 @@ #include "webkit/tools/test_shell/test_shell_switches.h" #include "webkit/tools/test_shell/test_webview_delegate.h" -#if defined(ENABLE_CLIENT_BASED_GEOLOCATION) -#include "third_party/WebKit/WebKit/chromium/public/WebGeolocationClientMock.h" -#endif - -#if defined(OS_MACOSX) -#include "base/mac_util.h" -#endif - using WebKit::WebCanvas; using WebKit::WebFrame; using WebKit::WebNavigationPolicy; @@ -901,9 +899,8 @@ bool GetFontTable(int fd, uint32_t table, uint8_t* output, } #endif -void GetPlugins(bool refresh, - std::vector<webkit::npapi::WebPluginInfo>* plugins) { - webkit::npapi::PluginList::Singleton()->GetPlugins(refresh, plugins); +void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) { + NPAPI::PluginList::Singleton()->GetPlugins(refresh, plugins); // Don't load the forked TestNetscapePlugIn in the chromium code, use // the copy in webkit.org's repository instead. const FilePath::StringType kPluginBlackList[] = { @@ -912,10 +909,10 @@ void GetPlugins(bool refresh, FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"), }; for (int i = plugins->size() - 1; i >= 0; --i) { - webkit::npapi::WebPluginInfo plugin_info = plugins->at(i); + WebPluginInfo plugin_info = plugins->at(i); for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { - webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path); + NPAPI::PluginList::Singleton()->DisablePlugin(plugin_info.path); plugins->erase(plugins->begin() + i); } } diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index 9ebd278..bec7e53 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -400,6 +400,10 @@ '../../glue/media/simple_data_source_unittest.cc', '../../glue/mimetype_unittest.cc', '../../glue/multipart_response_delegate_unittest.cc', + '../../glue/plugins/plugin_group_unittest.cc', + '../../glue/plugins/plugin_lib_unittest.cc', + '../../glue/plugins/url_request_info_unittest.cc', + '../../glue/plugins/webplugin_impl_unittest.cc', '../../glue/regular_expression_unittest.cc', '../../glue/resource_fetcher_unittest.cc', '../../glue/unittest_test_server.h', @@ -411,18 +415,12 @@ '../../mocks/mock_resource_loader_bridge.h', '../../mocks/mock_webframe.h', '../../mocks/mock_weburlloader.h', - '../../plugins/npapi/plugin_group_unittest.cc', - '../../plugins/npapi/plugin_group_unittest.cc', - '../../plugins/npapi/plugin_lib_unittest.cc', - '../../plugins/npapi/plugin_lib_unittest.cc', - '../../plugins/npapi/webplugin_impl_unittest.cc', '../../plugins/ppapi/mock_plugin_delegate.cc', '../../plugins/ppapi/mock_plugin_delegate.h', '../../plugins/ppapi/mock_resource.h', '../../plugins/ppapi/ppapi_unittest.cc', '../../plugins/ppapi/ppapi_unittest.h', '../../plugins/ppapi/resource_tracker_unittest.cc', - '../../plugins/ppapi/url_request_info_unittest.cc', '../webcore_unit_tests/BMPImageDecoder_unittest.cpp', '../webcore_unit_tests/ICOImageDecoder_unittest.cpp', 'event_listener_unittest.cc', @@ -515,13 +513,13 @@ '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', ], 'sources': [ - '../../plugins/npapi/test/npapi_constants.cc', - '../../plugins/npapi/test/npapi_constants.h', - '../../plugins/npapi/test/plugin_client.cc', - '../../plugins/npapi/test/plugin_client.h', - '../../plugins/npapi/test/plugin_test.cc', - '../../plugins/npapi/test/plugin_test.h', - '../../plugins/npapi/test/plugin_test_factory.h', + '../../glue/plugins/test/npapi_constants.cc', + '../../glue/plugins/test/npapi_constants.h', + '../../glue/plugins/test/plugin_client.cc', + '../../glue/plugins/test/plugin_client.h', + '../../glue/plugins/test/plugin_test.cc', + '../../glue/plugins/test/plugin_test.h', + '../../glue/plugins/test/plugin_test_factory.h', ], }, { @@ -537,51 +535,51 @@ 'npapi_test_common', ], 'sources': [ - '../../plugins/npapi/test/npapi_test.cc', - '../../plugins/npapi/test/npapi_test.def', - '../../plugins/npapi/test/npapi_test.rc', - '../../plugins/npapi/test/plugin_arguments_test.cc', - '../../plugins/npapi/test/plugin_arguments_test.h', - '../../plugins/npapi/test/plugin_create_instance_in_paint.cc', - '../../plugins/npapi/test/plugin_create_instance_in_paint.h', - '../../plugins/npapi/test/plugin_delete_plugin_in_stream_test.cc', - '../../plugins/npapi/test/plugin_delete_plugin_in_stream_test.h', - '../../plugins/npapi/test/plugin_get_javascript_url_test.cc', - '../../plugins/npapi/test/plugin_get_javascript_url_test.h', - '../../plugins/npapi/test/plugin_get_javascript_url2_test.cc', - '../../plugins/npapi/test/plugin_get_javascript_url2_test.h', - '../../plugins/npapi/test/plugin_geturl_test.cc', - '../../plugins/npapi/test/plugin_geturl_test.h', - '../../plugins/npapi/test/plugin_javascript_open_popup.cc', - '../../plugins/npapi/test/plugin_javascript_open_popup.h', - '../../plugins/npapi/test/plugin_new_fails_test.cc', - '../../plugins/npapi/test/plugin_new_fails_test.h', - '../../plugins/npapi/test/plugin_npobject_lifetime_test.cc', - '../../plugins/npapi/test/plugin_npobject_lifetime_test.h', - '../../plugins/npapi/test/plugin_npobject_proxy_test.cc', - '../../plugins/npapi/test/plugin_npobject_proxy_test.h', - '../../plugins/npapi/test/plugin_schedule_timer_test.cc', - '../../plugins/npapi/test/plugin_schedule_timer_test.h', - '../../plugins/npapi/test/plugin_setup_test.cc', - '../../plugins/npapi/test/plugin_setup_test.h', - '../../plugins/npapi/test/plugin_thread_async_call_test.cc', - '../../plugins/npapi/test/plugin_thread_async_call_test.h', - '../../plugins/npapi/test/plugin_windowed_test.cc', - '../../plugins/npapi/test/plugin_windowed_test.h', - '../../plugins/npapi/test/plugin_private_test.cc', - '../../plugins/npapi/test/plugin_private_test.h', - '../../plugins/npapi/test/plugin_test_factory.cc', - '../../plugins/npapi/test/plugin_window_size_test.cc', - '../../plugins/npapi/test/plugin_window_size_test.h', - '../../plugins/npapi/test/plugin_windowless_test.cc', - '../../plugins/npapi/test/plugin_windowless_test.h', - '../../plugins/npapi/test/resource.h', + '../../glue/plugins/test/npapi_test.cc', + '../../glue/plugins/test/npapi_test.def', + '../../glue/plugins/test/npapi_test.rc', + '../../glue/plugins/test/plugin_arguments_test.cc', + '../../glue/plugins/test/plugin_arguments_test.h', + '../../glue/plugins/test/plugin_create_instance_in_paint.cc', + '../../glue/plugins/test/plugin_create_instance_in_paint.h', + '../../glue/plugins/test/plugin_delete_plugin_in_stream_test.cc', + '../../glue/plugins/test/plugin_delete_plugin_in_stream_test.h', + '../../glue/plugins/test/plugin_get_javascript_url_test.cc', + '../../glue/plugins/test/plugin_get_javascript_url_test.h', + '../../glue/plugins/test/plugin_get_javascript_url2_test.cc', + '../../glue/plugins/test/plugin_get_javascript_url2_test.h', + '../../glue/plugins/test/plugin_geturl_test.cc', + '../../glue/plugins/test/plugin_geturl_test.h', + '../../glue/plugins/test/plugin_javascript_open_popup.cc', + '../../glue/plugins/test/plugin_javascript_open_popup.h', + '../../glue/plugins/test/plugin_new_fails_test.cc', + '../../glue/plugins/test/plugin_new_fails_test.h', + '../../glue/plugins/test/plugin_npobject_lifetime_test.cc', + '../../glue/plugins/test/plugin_npobject_lifetime_test.h', + '../../glue/plugins/test/plugin_npobject_proxy_test.cc', + '../../glue/plugins/test/plugin_npobject_proxy_test.h', + '../../glue/plugins/test/plugin_schedule_timer_test.cc', + '../../glue/plugins/test/plugin_schedule_timer_test.h', + '../../glue/plugins/test/plugin_setup_test.cc', + '../../glue/plugins/test/plugin_setup_test.h', + '../../glue/plugins/test/plugin_thread_async_call_test.cc', + '../../glue/plugins/test/plugin_thread_async_call_test.h', + '../../glue/plugins/test/plugin_windowed_test.cc', + '../../glue/plugins/test/plugin_windowed_test.h', + '../../glue/plugins/test/plugin_private_test.cc', + '../../glue/plugins/test/plugin_private_test.h', + '../../glue/plugins/test/plugin_test_factory.cc', + '../../glue/plugins/test/plugin_window_size_test.cc', + '../../glue/plugins/test/plugin_window_size_test.h', + '../../glue/plugins/test/plugin_windowless_test.cc', + '../../glue/plugins/test/plugin_windowless_test.h', + '../../glue/plugins/test/resource.h', ], 'include_dirs': [ '../../..', ], 'xcode_settings': { - 'INFOPLIST_FILE': '<(DEPTH)/webkit/plugins/npapi/test/Info.plist', + 'INFOPLIST_FILE': '<(DEPTH)/webkit/glue/plugins/test/Info.plist', }, 'conditions': [ ['OS!="win"', { @@ -589,16 +587,16 @@ # TODO(port): Port these. # plugin_npobject_lifetime_test.cc has win32-isms # (HWND, CALLBACK). - '../../plugins/npapi/test/plugin_npobject_lifetime_test.cc', + '../../glue/plugins/test/plugin_npobject_lifetime_test.cc', # The window APIs are necessarily platform-specific. - '../../plugins/npapi/test/plugin_window_size_test.cc', - '../../plugins/npapi/test/plugin_windowed_test.cc', + '../../glue/plugins/test/plugin_window_size_test.cc', + '../../glue/plugins/test/plugin_windowed_test.cc', # Seems windows specific. - '../../plugins/npapi/test/plugin_create_instance_in_paint.cc', - '../../plugins/npapi/test/plugin_create_instance_in_paint.h', + '../../glue/plugins/test/plugin_create_instance_in_paint.cc', + '../../glue/plugins/test/plugin_create_instance_in_paint.h', # windows-specific resources - '../../plugins/npapi/test/npapi_test.def', - '../../plugins/npapi/test/npapi_test.rc', + '../../glue/plugins/test/npapi_test.def', + '../../glue/plugins/test/npapi_test.rc', ], }], ['OS=="mac"', { @@ -612,7 +610,7 @@ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'sources!': [ # Needs simple event record type porting - '../../plugins/npapi/test/plugin_windowless_test.cc', + '../../glue/plugins/test/plugin_windowless_test.cc', ], }], ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and (target_arch=="x64" or target_arch=="arm")', { diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm index 249ccba..3f95276 100644 --- a/webkit/tools/test_shell/test_shell_mac.mm +++ b/webkit/tools/test_shell/test_shell_mac.mm @@ -33,7 +33,7 @@ #include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" -#include "webkit/plugins/npapi/plugin_list.h" +#include "webkit/glue/plugins/plugin_list.h" #include "webkit/tools/test_shell/mac/test_shell_webview.h" #include "webkit/tools/test_shell/resource.h" #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" @@ -252,7 +252,7 @@ void TestShell::InitializeTestShell(bool layout_test_mode, } else { plugins_dir = plugins_dir.AppendASCII("plugins"); } - webkit::npapi::PluginList::Singleton()->AddExtraPluginDir(plugins_dir); + NPAPI::PluginList::Singleton()->AddExtraPluginDir(plugins_dir); } NSButton* MakeTestButton(NSRect* rect, NSString* title, NSView* parent) { diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 7bc87e4..3f72f2c 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -33,6 +33,9 @@ #include "third_party/WebKit/WebKit/chromium/public/WebFileError.h" #include "third_party/WebKit/WebKit/chromium/public/WebFileSystemCallbacks.h" #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#if defined(ENABLE_CLIENT_BASED_GEOLOCATION) +#include "third_party/WebKit/WebKit/chromium/public/WebGeolocationClientMock.h" +#endif #include "third_party/WebKit/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/WebKit/chromium/public/WebKitClient.h" #include "third_party/WebKit/WebKit/chromium/public/WebNode.h" @@ -56,14 +59,14 @@ #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/glue/glue_serialize.h" #include "webkit/glue/media/video_renderer_impl.h" +#include "webkit/glue/plugins/webplugin_impl.h" +#include "webkit/glue/plugins/plugin_list.h" +#include "webkit/glue/plugins/webplugin_delegate_impl.h" #include "webkit/glue/webdropdata.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webmediaplayer_impl.h" #include "webkit/glue/webpreferences.h" #include "webkit/glue/window_open_disposition.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/tools/test_shell/accessibility_controller.h" #include "webkit/tools/test_shell/mock_spellcheck.h" #include "webkit/tools/test_shell/notification_presenter.h" @@ -74,10 +77,6 @@ #include "webkit/tools/test_shell/test_shell.h" #include "webkit/tools/test_shell/test_web_worker.h" -#if defined(ENABLE_CLIENT_BASED_GEOLOCATION) -#include "third_party/WebKit/WebKit/chromium/public/WebGeolocationClientMock.h" -#endif - #if defined(OS_WIN) // TODO(port): make these files work everywhere. #include "webkit/tools/test_shell/drag_delegate.h" @@ -712,22 +711,22 @@ WebScreenInfo TestWebViewDelegate::screenInfo() { // WebFrameClient ------------------------------------------------------------ -WebPlugin* TestWebViewDelegate::createPlugin(WebFrame* frame, - const WebPluginParams& params) { +WebPlugin* TestWebViewDelegate::createPlugin( + WebFrame* frame, const WebPluginParams& params) { bool allow_wildcard = true; - webkit::npapi::WebPluginInfo info; + WebPluginInfo info; std::string actual_mime_type; - if (!webkit::npapi::PluginList::Singleton()->GetPluginInfo( + if (!NPAPI::PluginList::Singleton()->GetPluginInfo( params.url, params.mimeType.utf8(), allow_wildcard, &info, &actual_mime_type) || !info.enabled) return NULL; - return new webkit::npapi::WebPluginImpl( + return new webkit_glue::WebPluginImpl( frame, params, info.path, actual_mime_type, AsWeakPtr()); } -WebWorker* TestWebViewDelegate::createWorker(WebFrame* frame, - WebWorkerClient* client) { +WebWorker* TestWebViewDelegate::createWorker( + WebFrame* frame, WebWorkerClient* client) { return new TestWebWorker(); } diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h index a4de21e..f5d81ad 100644 --- a/webkit/tools/test_shell/test_webview_delegate.h +++ b/webkit/tools/test_shell/test_webview_delegate.h @@ -9,39 +9,40 @@ #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_ #define WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_ +#include "build/build_config.h" + +#if defined(OS_WIN) +#include <windows.h> +#endif + #include <map> #include <set> #include <string> +#if defined(TOOLKIT_USES_GTK) +#include <gdk/gdkcursor.h> +#endif + #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "base/weak_ptr.h" -#include "build/build_config.h" #include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h" #include "third_party/WebKit/WebKit/chromium/public/WebFileSystem.h" #include "third_party/WebKit/WebKit/chromium/public/WebFrameClient.h" #include "third_party/WebKit/WebKit/chromium/public/WebRect.h" -#include "third_party/WebKit/WebKit/chromium/public/WebPopupType.h" -#include "third_party/WebKit/WebKit/chromium/public/WebViewClient.h" -#include "webkit/glue/webcursor.h" -#include "webkit/plugins/npapi/webplugin_page_delegate.h" -#include "webkit/tools/test_shell/mock_spellcheck.h" -#include "webkit/tools/test_shell/test_navigation_controller.h" - #if defined(OS_MACOSX) #include "third_party/WebKit/WebKit/chromium/public/WebPopupMenuInfo.h" #endif - +#include "third_party/WebKit/WebKit/chromium/public/WebPopupType.h" +#include "third_party/WebKit/WebKit/chromium/public/WebViewClient.h" +#include "webkit/glue/webcursor.h" +#include "webkit/glue/plugins/webplugin_page_delegate.h" #if defined(OS_WIN) -#include <windows.h> - #include "webkit/tools/test_shell/drag_delegate.h" #include "webkit/tools/test_shell/drop_delegate.h" #endif - -#if defined(TOOLKIT_USES_GTK) -#include <gdk/gdkcursor.h> -#endif +#include "webkit/tools/test_shell/mock_spellcheck.h" +#include "webkit/tools/test_shell/test_navigation_controller.h" struct WebPreferences; class GURL; @@ -59,7 +60,7 @@ struct WebWindowFeatures; class TestWebViewDelegate : public WebKit::WebViewClient, public WebKit::WebFrameClient, - public webkit::npapi::WebPluginPageDelegate, + public webkit_glue::WebPluginPageDelegate, public base::SupportsWeakPtr<TestWebViewDelegate> { public: struct CapturedContextMenuEvent { @@ -238,8 +239,8 @@ class TestWebViewDelegate : public WebKit::WebViewClient, bool create, WebKit::WebFileSystemCallbacks* callbacks); - // webkit::npapi::WebPluginPageDelegate - virtual webkit::npapi::WebPluginDelegate* CreatePluginDelegate( + // webkit_glue::WebPluginPageDelegate + virtual webkit_glue::WebPluginDelegate* CreatePluginDelegate( const FilePath& url, const std::string& mime_type); virtual void CreatedPluginWindow( @@ -247,7 +248,7 @@ class TestWebViewDelegate : public WebKit::WebViewClient, virtual void WillDestroyPluginWindow( gfx::PluginWindowHandle handle); virtual void DidMovePlugin( - const webkit::npapi::WebPluginGeometry& move); + const webkit_glue::WebPluginGeometry& move); virtual void DidStartLoadingForPlugin() {} virtual void DidStopLoadingForPlugin() {} virtual void ShowModalHTMLDialogForPlugin( diff --git a/webkit/tools/test_shell/test_webview_delegate_gtk.cc b/webkit/tools/test_shell/test_webview_delegate_gtk.cc index aff8a45..51cfde3 100644 --- a/webkit/tools/test_shell/test_webview_delegate_gtk.cc +++ b/webkit/tools/test_shell/test_webview_delegate_gtk.cc @@ -21,15 +21,15 @@ #include "third_party/WebKit/WebKit/chromium/public/WebRect.h" #include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include "third_party/WebKit/WebKit/chromium/public/WebView.h" +#include "webkit/glue/plugins/webplugin.h" #include "webkit/glue/webcursor.h" #include "webkit/glue/webdropdata.h" #include "webkit/glue/webpreferences.h" #include "webkit/glue/webkit_glue.h" +#include "webkit/glue/plugins/gtk_plugin_container_manager.h" +#include "webkit/glue/plugins/plugin_list.h" #include "webkit/glue/window_open_disposition.h" -#include "webkit/plugins/npapi/gtk_plugin_container_manager.h" -#include "webkit/plugins/npapi/plugin_list.h" -#include "webkit/plugins/npapi/webplugin.h" -#include "webkit/plugins/npapi/webplugin_delegate_impl.h" +#include "webkit/glue/plugins/webplugin_delegate_impl.h" #include "webkit/tools/test_shell/test_navigation_controller.h" #include "webkit/tools/test_shell/test_shell.h" @@ -197,7 +197,7 @@ void TestWebViewDelegate::runModal() { // WebPluginPageDelegate ------------------------------------------------------ -webkit::npapi::WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate( +webkit_glue::WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate( const FilePath& path, const std::string& mime_type) { // TODO(evanm): we probably shouldn't be doing this mapping to X ids at @@ -205,8 +205,7 @@ webkit::npapi::WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate( GdkNativeWindow plugin_parent = GDK_WINDOW_XWINDOW(shell_->webViewHost()->view_handle()->window); - return webkit::npapi::WebPluginDelegateImpl::Create( - path, mime_type, plugin_parent); + return WebPluginDelegateImpl::Create(path, mime_type, plugin_parent); } void TestWebViewDelegate::CreatedPluginWindow( @@ -220,9 +219,9 @@ void TestWebViewDelegate::WillDestroyPluginWindow( } void TestWebViewDelegate::DidMovePlugin( - const webkit::npapi::WebPluginGeometry& move) { + const webkit_glue::WebPluginGeometry& move) { WebWidgetHost* host = GetWidgetHost(); - webkit::npapi::GtkPluginContainerManager* plugin_container_manager = + GtkPluginContainerManager* plugin_container_manager = static_cast<WebViewHost*>(host)->plugin_container_manager(); plugin_container_manager->MovePluginContainer(move); } diff --git a/webkit/tools/test_shell/test_webview_delegate_win.cc b/webkit/tools/test_shell/test_webview_delegate_win.cc index 83abf40..64b6a1b 100644 --- a/webkit/tools/test_shell/test_webview_delegate_win.cc +++ b/webkit/tools/test_shell/test_webview_delegate_win.cc @@ -23,13 +23,13 @@ #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/WebKit/chromium/public/WebRect.h" #include "third_party/WebKit/WebKit/chromium/public/WebView.h" +#include "webkit/glue/plugins/webplugin.h" #include "webkit/glue/webdropdata.h" #include "webkit/glue/webpreferences.h" #include "webkit/glue/webkit_glue.h" +#include "webkit/glue/plugins/plugin_list.h" +#include "webkit/glue/plugins/webplugin_delegate_impl.h" #include "webkit/glue/window_open_disposition.h" -#include "webkit/plugins/npapi/webplugin.h" -#include "webkit/plugins/npapi/plugin_list.h" -#include "webkit/plugins/npapi/webplugin_delegate_impl.h" #include "webkit/tools/test_shell/drag_delegate.h" #include "webkit/tools/test_shell/drop_delegate.h" #include "webkit/tools/test_shell/test_navigation_controller.h" @@ -133,14 +133,14 @@ void TestWebViewDelegate::runModal() { // WebPluginPageDelegate ------------------------------------------------------ -webkit::npapi::WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate( +webkit_glue::WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate( const FilePath& path, const std::string& mime_type) { HWND hwnd = shell_->webViewHost()->view_handle(); if (!hwnd) return NULL; - return webkit::npapi::WebPluginDelegateImpl::Create(path, mime_type, hwnd); + return WebPluginDelegateImpl::Create(path, mime_type, hwnd); } void TestWebViewDelegate::CreatedPluginWindow( @@ -154,7 +154,7 @@ void TestWebViewDelegate::WillDestroyPluginWindow( } void TestWebViewDelegate::DidMovePlugin( - const webkit::npapi::WebPluginGeometry& move) { + const webkit_glue::WebPluginGeometry& move) { unsigned long flags = 0; if (move.rects_valid) { diff --git a/webkit/tools/test_shell/webview_host.h b/webkit/tools/test_shell/webview_host.h index 7a47ec3..7aade20 100644 --- a/webkit/tools/test_shell/webview_host.h +++ b/webkit/tools/test_shell/webview_host.h @@ -11,7 +11,7 @@ #include "webkit/tools/test_shell/webwidget_host.h" #if defined(TOOLKIT_USES_GTK) -#include "webkit/plugins/npapi/gtk_plugin_container_manager.h" +#include "webkit/glue/plugins/gtk_plugin_container_manager.h" #endif struct WebPreferences; @@ -42,7 +42,7 @@ class WebViewHost : public WebWidgetHost { // Destroy the plugin parent container when a plugin has been destroyed. void DestroyPluginContainer(gfx::PluginWindowHandle id); - webkit::npapi::GtkPluginContainerManager* plugin_container_manager() { + GtkPluginContainerManager* plugin_container_manager() { return &plugin_container_manager_; } #elif defined(OS_MACOSX) @@ -58,7 +58,7 @@ class WebViewHost : public WebWidgetHost { #if defined(TOOLKIT_USES_GTK) // Helper class that creates and moves plugin containers. - webkit::npapi::GtkPluginContainerManager plugin_container_manager_; + GtkPluginContainerManager plugin_container_manager_; #endif }; diff --git a/webkit/tools/test_shell/webview_host_gtk.cc b/webkit/tools/test_shell/webview_host_gtk.cc index 92a6016..60b8a81 100644 --- a/webkit/tools/test_shell/webview_host_gtk.cc +++ b/webkit/tools/test_shell/webview_host_gtk.cc @@ -11,8 +11,8 @@ #include "gfx/size.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/WebKit/chromium/public/WebView.h" +#include "webkit/glue/plugins/gtk_plugin_container.h" #include "webkit/glue/webpreferences.h" -#include "webkit/plugins/npapi/gtk_plugin_container.h" #include "webkit/tools/test_shell/test_webview_delegate.h" using WebKit::WebDevToolsAgentClient; |