diff options
Diffstat (limited to 'webkit/plugins/npapi')
44 files changed, 190 insertions, 185 deletions
diff --git a/webkit/plugins/npapi/test/npapi_constants.cc b/webkit/plugins/npapi/test/npapi_constants.cc index 75cc68f..94d3284 100644 --- a/webkit/plugins/npapi/test/npapi_constants.cc +++ b/webkit/plugins/npapi/test/npapi_constants.cc @@ -1,10 +1,12 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// 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 "webkit/glue/plugins/test/npapi_constants.h" +#include "webkit/plugins/npapi/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 6570c35..2d375b0 100644 --- a/webkit/plugins/npapi/test/npapi_constants.h +++ b/webkit/plugins/npapi/test/npapi_constants.h @@ -1,13 +1,14 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// 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. // Constants for the NPAPI test -#ifndef WEBKIT_PORT_PLUGINS_TEST_NPAPI_CONSTANTS_H__ -#define WEBKIT_PORT_PLUGINS_TEST_NPAPI_CONSTANTS_H__ +#ifndef WEBKIT_PLUGINS_NPAPI_TEST_NPAPI_CONSTANTS_H_ +#define WEBKIT_PLUGINS_NPAPI_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[]; @@ -15,5 +16,7 @@ extern const char kTestCompleteCookie[]; // The cookie value which will be sent to the client upon successful // test. extern const char kTestCompleteSuccess[]; -} -#endif // WEBKIT_PORT_PLUGINS_TEST_NPAPI_CONSTANTS_H__ + +} // namespace NPAPIClient + +#endif // WEBKIT_PLUGINS_NPAPI_TEST_NPAPI_CONSTANTS_H_ diff --git a/webkit/plugins/npapi/test/npapi_test.cc b/webkit/plugins/npapi/test/npapi_test.cc index 895a842..26dc45d 100644 --- a/webkit/plugins/npapi/test/npapi_test.cc +++ b/webkit/plugins/npapi/test/npapi_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// 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. @@ -53,7 +53,7 @@ #define EXPORT #endif -#include "webkit/glue/plugins/test/plugin_client.h" +#include "webkit/plugins/npapi/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 46ccf43..fe1e54e 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 aa05f19..c2a0eaa 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) 2006-2008 The Chromium Authors. All rights reserved. +// 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. -#ifndef WEBKIT_PORT_PLUGINS_TEST_PLUGIN_ARGUMENTS_TEST_H__ -#define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_ARGUMENTS_TEST_H__ +#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_ARGUMENTS_TEST_H_ +#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_ARGUMENTS_TEST_H_ -#include "webkit/glue/plugins/test/plugin_test.h" +#include "webkit/plugins/npapi/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_PORT_PLUGINS_TEST_PLUGIN_ARGUMENTS_TEST_H__ +#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_ARGUMENTS_TEST_H_ diff --git a/webkit/plugins/npapi/test/plugin_client.cc b/webkit/plugins/npapi/test/plugin_client.cc index 8358340..0b28250 100644 --- a/webkit/plugins/npapi/test/plugin_client.cc +++ b/webkit/plugins/npapi/test/plugin_client.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// 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 "webkit/glue/plugins/test/plugin_client.h" +#include "webkit/plugins/npapi/test/plugin_client.h" #include "base/string_util.h" -#include "webkit/glue/plugins/test/plugin_test.h" -#include "webkit/glue/plugins/test/plugin_test_factory.h" +#include "webkit/plugins/npapi/test/plugin_test.h" +#include "webkit/plugins/npapi/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 a6291b0..c06be2d 100644 --- a/webkit/plugins/npapi/test/plugin_client.h +++ b/webkit/plugins/npapi/test/plugin_client.h @@ -1,9 +1,9 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// 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. -#ifndef WEBKIT_PORT_PLUGINS_TEST_PLUGIN_CLIENT_H__ -#define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_CLIENT_H__ +#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CLIENT_H_ +#define WEBKIT_PLUGINS_NPAPI_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_PORT_PLUGINS_TEST_PLUGIN_CLIENT_H__ +#endif // WEBKIT_PLUGINS_NPAPI_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 f98f89b..09d6bdc 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) 2009 The Chromium Authors. All rights reserved. +// 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 "webkit/glue/plugins/test/plugin_create_instance_in_paint.h" +#include "webkit/plugins/npapi/test/plugin_create_instance_in_paint.h" -#include "webkit/glue/plugins/test/plugin_client.h" +#include "webkit/plugins/npapi/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 84d7a94..59f196f 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_GLUE_PLUGINS_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H -#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H +#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H_ +#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H_ -#include "webkit/glue/plugins/test/plugin_test.h" +#include "webkit/plugins/npapi/test/plugin_test.h" namespace NPAPIClient { @@ -28,6 +28,6 @@ class CreateInstanceInPaintTest : public PluginTest { bool created_; }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H +#endif // WEBKIT_PLUGINS_NPAPI_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 15318b4..fad7992 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) 2006-2008 The Chromium Authors. All rights reserved. +// 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 "webkit/glue/plugins/test/plugin_delete_plugin_in_stream_test.h" +#include "webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.h" -#include "webkit/glue/plugins/test/plugin_client.h" +#include "webkit/plugins/npapi/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 418e976..dca9de3 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) 2006-2008 The Chromium Authors. All rights reserved. +// 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. -#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H -#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H +#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H_ +#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H_ -#include "webkit/glue/plugins/test/plugin_test.h" +#include "webkit/plugins/npapi/test/plugin_test.h" namespace NPAPIClient { @@ -25,6 +25,6 @@ class DeletePluginInStreamTest : public PluginTest { std::string self_url_; }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H +#endif // WEBKIT_PLUGINS_NPAPI_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 d17dced..e7595f2 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) 2006-2009 The Chromium Authors. All rights reserved. +// 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 "webkit/glue/plugins/test/plugin_get_javascript_url2_test.h" +#include "webkit/plugins/npapi/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 557da76..b5c398e 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) 2006-2008 The Chromium Authors. All rights reserved. +// 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. -#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL2_H -#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL2_H +#ifndef WEBKIT_PLUGINS_NPAPI_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL2_H_ +#define WEBKIT_PLUGINS_NPAPI_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL2_H_ -#include "webkit/glue/plugins/test/plugin_test.h" +#include "webkit/plugins/npapi/test/plugin_test.h" namespace NPAPIClient { @@ -33,6 +33,6 @@ class ExecuteGetJavascriptUrl2Test : public PluginTest { std::string self_url_; }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL2_H +#endif // WEBKIT_PLUGINS_NPAPI_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 50f5e5a..ea32fac 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) 2006-2008 The Chromium Authors. All rights reserved. +// 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 "webkit/glue/plugins/test/plugin_get_javascript_url_test.h" +#include "webkit/plugins/npapi/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 5c2540d..9aab3f9 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) 2006-2008 The Chromium Authors. All rights reserved. +// 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. -#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL_H -#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL_H +#ifndef WEBKIT_PLUGINS_NPAPI_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL_H_ +#define WEBKIT_PLUGINS_NPAPI_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL_H_ -#include "webkit/glue/plugins/test/plugin_test.h" +#include "webkit/plugins/npapi/test/plugin_test.h" namespace NPAPIClient { @@ -42,6 +42,6 @@ class ExecuteGetJavascriptUrlTest : public PluginTest { #endif }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL_H +#endif // WEBKIT_PLUGINS_NPAPI_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 5363a66..850a0b5 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/glue/plugins/test/plugin_geturl_test.h" +#include "webkit/plugins/npapi/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 df8d741..79c623b 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) 2006-2008 The Chromium Authors. All rights reserved. +// 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. -#ifndef WEBKIT_PORT_PLUGINS_TEST_PLUGIN_GETURL_TEST_H__ -#define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_GETURL_TEST_H__ +#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_GETURL_TEST_H_ +#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_GETURL_TEST_H_ #include <stdio.h> -#include "webkit/glue/plugins/test/plugin_test.h" +#include "webkit/plugins/npapi/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_PORT_PLUGINS_TEST_PLUGIN_GETURL_TEST_H__ +#endif // WEBKIT_PLUGINS_NPAPI_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 0f93bf4..583a55e 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) 2006-2008 The Chromium Authors. All rights reserved. +// 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 "build/build_config.h" -#include "webkit/glue/plugins/test/plugin_javascript_open_popup.h" +#include "webkit/plugins/npapi/test/plugin_javascript_open_popup.h" #if defined(USE_X11) #include "third_party/npapi/bindings/npapi_x11.h" #endif -#include "webkit/glue/plugins/test/plugin_client.h" +#include "webkit/plugins/npapi/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 552397a..6381d25 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) 2006-2008 The Chromium Authors. All rights reserved. +// 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. -#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H -#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H +#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H_ +#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H_ -#include "webkit/glue/plugins/test/plugin_test.h" +#include "webkit/plugins/npapi/test/plugin_test.h" namespace NPAPIClient { @@ -42,6 +42,6 @@ class ExecuteJavascriptPopupWindowTargetPluginTest : public PluginTest { bool test_completed_; }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H +#endif // WEBKIT_PLUGINS_NPAPI_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 2feeec6..71cff01 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) 2006-2008 The Chromium Authors. All rights reserved. +// 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 "webkit/glue/plugins/test/plugin_new_fails_test.h" +#include "webkit/plugins/npapi/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 1acf9e5..334323e 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) 2006-2008 The Chromium Authors. All rights reserved. +// 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. -#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_PLUGIN_NEW_FAILS_TEST_H__ -#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_PLUGIN_NEW_FAILS_TEST_H__ +#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_PLUGIN_NEW_FAILS_TEST_H_ +#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_PLUGIN_NEW_FAILS_TEST_H_ -#include "webkit/glue/plugins/test/plugin_test.h" +#include "webkit/plugins/npapi/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_GLUE_PLUGINS_TEST_PLUGIN_PLUGIN_NPP_NEW_FAILS_TEST_H__ +#endif // WEBKIT_PLUGINS_NPAPI_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 4564506..f493238 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) 2006-2008 The Chromium Authors. All rights reserved. +// 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 "webkit/glue/plugins/test/plugin_npobject_lifetime_test.h" +#include "webkit/plugins/npapi/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 60d0314..12cf4e2 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) 2006-2008 The Chromium Authors. All rights reserved. +// 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. -#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_NPOBJECT_LIFETIME_TEST_H__ -#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_NPOBJECT_LIFETIME_TEST_H__ +#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_LIFETIME_TEST_H_ +#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_LIFETIME_TEST_H_ #include "build/build_config.h" -#include "webkit/glue/plugins/test/plugin_test.h" +#include "webkit/plugins/npapi/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_GLUE_PLUGINS_TEST_PLUGIN_NPOBJECT_LIFETIME_TEST_H__ +#endif // WEBKIT_PLUGINS_NPAPI_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 5b3a2ca..c9cd27f 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) 2006-2008 The Chromium Authors. All rights reserved. +// 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. @@ -9,7 +9,7 @@ #define STRSAFE_NO_DEPRECATE #include <strsafe.h> #endif -#include "webkit/glue/plugins/test/plugin_npobject_proxy_test.h" +#include "webkit/plugins/npapi/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 3d14ddb..8585d0f 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) 2006-2008 The Chromium Authors. All rights reserved. +// 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. -#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_NPOBJECT_PROXY_TEST_H__ -#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_NPOBJECT_PROXY_TEST_H__ +#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_PROXY_TEST_H_ +#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_PROXY_TEST_H_ -#include "webkit/glue/plugins/test/plugin_test.h" +#include "webkit/plugins/npapi/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_GLUE_PLUGINS_TEST_PLUGIN_NPOBJECT_PROXY_TEST_H__ +#endif // WEBKIT_PLUGINS_NPAPI_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 cdab7ce..b3aabce 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) 2009 The Chromium Authors. All rights reserved. +// 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 "webkit/glue/plugins/test/plugin_private_test.h" +#include "webkit/plugins/npapi/test/plugin_private_test.h" #include "base/basictypes.h" #include "base/string_util.h" -#include "webkit/glue/plugins/test/plugin_client.h" +#include "webkit/plugins/npapi/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 db6b5d1..9079a11 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) 2009 The Chromium Authors. All rights reserved. +// 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. -#ifndef WEBKIT_PORT_PLUGINS_TEST_PLUGIN_PRIVATE_TEST_H_ -#define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_PRIVATE_TEST_H_ +#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_PRIVATE_TEST_H_ +#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_PRIVATE_TEST_H_ -#include "webkit/glue/plugins/test/plugin_test.h" +#include "webkit/plugins/npapi/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_PORT_PLUGINS_TEST_PLUGIN_PRIVATE_TEST_H_ +#endif // WEBKIT_PLUGINS_NPAPI_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 fbfce34..831ab29 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) 2006-2008 The Chromium Authors. All rights reserved. +// 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 "webkit/glue/plugins/test/plugin_schedule_timer_test.h" -#include "webkit/glue/plugins/test/plugin_client.h" +#include "webkit/plugins/npapi/test/plugin_schedule_timer_test.h" +#include "webkit/plugins/npapi/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 e3e6505a..043672c 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_GLUE_PLUGINS_TEST_PLUGIN_SCHEDULE_TIMER_TEST_H -#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_SCHEDULE_TIMER_TEST_H +#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_SCHEDULE_TIMER_TEST_H +#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_SCHEDULE_TIMER_TEST_H #include "base/at_exit.h" #include "base/time.h" -#include "webkit/glue/plugins/test/plugin_test.h" +#include "webkit/plugins/npapi/test/plugin_test.h" namespace NPAPIClient { @@ -65,4 +65,4 @@ class ScheduleTimerTest : public PluginTest { } // namespace NPAPIClient -#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_SCHEDULE_TIMER_TEST_H +#endif // WEBKIT_PLUGINS_NPAPI_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 e4c4903..ded1379 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/glue/plugins/test/plugin_setup_test.h" +#include "webkit/plugins/npapi/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 b01bc42..709b3b1 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_GLUE_PLUGINS_TEST_PLUGIN_SETUP_TEST_H__ -#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_SETUP_TEST_H__ +#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_SETUP_TEST_H_ +#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_SETUP_TEST_H_ -#include "webkit/glue/plugins/test/plugin_test.h" +#include "webkit/plugins/npapi/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_GLUE_PLUGINS_TEST_PLUGIN_SETUP_TEST_H__ +#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_SETUP_TEST_H_ diff --git a/webkit/plugins/npapi/test/plugin_test.cc b/webkit/plugins/npapi/test/plugin_test.cc index 6717e4b..c948010 100644 --- a/webkit/plugins/npapi/test/plugin_test.cc +++ b/webkit/plugins/npapi/test/plugin_test.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// 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 "webkit/glue/plugins/test/plugin_test.h" +#include "webkit/plugins/npapi/test/plugin_test.h" #include "base/string_util.h" -#include "webkit/glue/plugins/test/npapi_constants.h" +#include "webkit/plugins/npapi/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 f3f8937..fee09d3 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_PORT_PLUGINS_TEST_PLUGIN_TEST_H_ -#define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_TEST_H_ +#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_H_ +#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_H_ #include <string> @@ -129,6 +129,6 @@ class PluginTest { bool test_completed_; }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_PORT_PLUGINS_TEST_PLUGIN_TEST_H_ +#endif // WEBKIT_PLUGINS_NPAPI_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 b4ae4f1..779ad00 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/glue/plugins/test/plugin_test_factory.h" +#include "webkit/plugins/npapi/test/plugin_test_factory.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" +#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" #if defined(OS_WIN) -#include "webkit/glue/plugins/test/plugin_windowed_test.h" +#include "webkit/plugins/npapi/test/plugin_windowed_test.h" #endif -#include "webkit/glue/plugins/test/plugin_windowless_test.h" +#include "webkit/plugins/npapi/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 3fd38d5..f1ed661 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_PORT_PLUGINS_TEST_PLUGIN_TEST_FACTROY_H__ -#define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_TEST_FACTROY_H__ +#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_FACTROY_H__ +#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_FACTROY_H__ #include <string> @@ -19,4 +19,4 @@ extern PluginTest* CreatePluginTest(const std::string& test_name, } // namespace NPAPIClient -#endif // WEBKIT_PORT_PLUGINS_TEST_PLUGIN_TEST_FACTROY_H__ +#endif // WEBKIT_PLUGINS_NPAPI_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 c01a49e..e28f84e 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/glue/plugins/test/plugin_thread_async_call_test.h" +#include "webkit/plugins/npapi/test/plugin_thread_async_call_test.h" #include "base/at_exit.h" #include "base/message_loop.h" #include "base/thread.h" -#include "webkit/glue/plugins/test/plugin_client.h" +#include "webkit/plugins/npapi/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 78e4e8d..9e6a011 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_GLUE_PLUGINS_TEST_PLUGIN_THREAD_ASYNC_CALL_TEST_H_ -#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_THREAD_ASYNC_CALL_TEST_H_ +#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_THREAD_ASYNC_CALL_TEST_H_ +#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_THREAD_ASYNC_CALL_TEST_H_ #include "base/scoped_ptr.h" -#include "webkit/glue/plugins/test/plugin_test.h" +#include "webkit/plugins/npapi/test/plugin_test.h" namespace base { class AtExitManager; @@ -36,4 +36,4 @@ class PluginThreadAsyncCallTest : public PluginTest { } // namespace NPAPIClient -#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_THREAD_ASYNC_CALL_TEST_H_ +#endif // WEBKIT_PLUGINS_NPAPI_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 9bfabca..abc08ad 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) 2006-2008 The Chromium Authors. All rights reserved. +// 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 "webkit/glue/plugins/test/plugin_window_size_test.h" -#include "webkit/glue/plugins/test/plugin_client.h" +#include "webkit/plugins/npapi/test/plugin_window_size_test.h" +#include "webkit/plugins/npapi/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 3650671..5a49479 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) 2006-2008 The Chromium Authors. All rights reserved. +// 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. -#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_WINDOW_SIZE_TEST_H -#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_WINDOW_SIZE_TEST_H +#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_WINDOW_SIZE_TEST_H_ +#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_WINDOW_SIZE_TEST_H_ -#include "webkit/glue/plugins/test/plugin_test.h" +#include "webkit/plugins/npapi/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_GLUE_PLUGINS_TEST_PLUGIN_WINDOW_SIZE_TEST_H +#endif // WEBKIT_PLUGINS_NPAPI_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 c82aa55..5635ec5 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) 2009 The Chromium Authors. All rights reserved. +// 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 "webkit/glue/plugins/test/plugin_windowed_test.h" -#include "webkit/glue/plugins/test/plugin_client.h" +#include "webkit/plugins/npapi/test/plugin_windowed_test.h" +#include "webkit/plugins/npapi/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 949ea86..4906933 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) 2009 The Chromium Authors. All rights reserved. +// 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. -#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_WINDOWED_TEST_H -#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_WINDOWED_TEST_H +#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_WINDOWED_TEST_H +#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_WINDOWED_TEST_H -#include "webkit/glue/plugins/test/plugin_test.h" +#include "webkit/plugins/npapi/test/plugin_test.h" namespace NPAPIClient { @@ -28,6 +28,6 @@ class WindowedPluginTest : public PluginTest { bool done_; }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_WINDOWED_TEST_H +#endif // WEBKIT_PLUGINS_NPAPI_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 aa6a9d7..17b9ca7 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/glue/plugins/test/plugin_windowless_test.h" -#include "webkit/glue/plugins/test/plugin_client.h" +#include "webkit/plugins/npapi/test/plugin_windowless_test.h" +#include "webkit/plugins/npapi/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 f336653..6f5ce15 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) 2006-2008 The Chromium Authors. All rights reserved. +// 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. -#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_EXECUTE_SCRIPT_DELETE_TEST_H -#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_EXECUTE_SCRIPT_DELETE_TEST_H +#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_EXECUTE_SCRIPT_DELETE_TEST_H_ +#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_EXECUTE_SCRIPT_DELETE_TEST_H_ -#include "webkit/glue/plugins/test/plugin_test.h" +#include "webkit/plugins/npapi/test/plugin_test.h" namespace NPAPIClient { @@ -30,6 +30,6 @@ class WindowlessPluginTest : public PluginTest { void ConvertPoint(NPNetscapeFuncs* browser); }; -} // namespace NPAPIClient +} // namespace NPAPIClient -#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_EXECUTE_SCRIPT_DELETE_TEST_H +#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_EXECUTE_SCRIPT_DELETE_TEST_H_ diff --git a/webkit/plugins/npapi/test/resource.h b/webkit/plugins/npapi/test/resource.h index c52fa82..422861f 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 |