diff options
author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 17:56:49 +0000 |
---|---|---|
committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 17:56:49 +0000 |
commit | 5bc5c15301e555c7d22b27d2b30c56b6ca1770ac (patch) | |
tree | 3224de17fcacd84b3e723922b9911d1f73a33c50 /ppapi | |
parent | e50540ec88e9a2102a028336335fc8eb4ee026ee (diff) | |
download | chromium_src-5bc5c15301e555c7d22b27d2b30c56b6ca1770ac.zip chromium_src-5bc5c15301e555c7d22b27d2b30c56b6ca1770ac.tar.gz chromium_src-5bc5c15301e555c7d22b27d2b30c56b6ca1770ac.tar.bz2 |
Remove RemoteAccessClientFirewallTraversal policy and code paths.
BUG=96318
TEST=
Review URL: http://codereview.chromium.org/8275012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106521 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r-- | ppapi/api/dev/ppb_query_policy_dev.idl | 26 | ||||
-rw-r--r-- | ppapi/api/dev/ppp_policy_update_dev.idl | 27 | ||||
-rw-r--r-- | ppapi/c/dev/ppb_query_policy_dev.h | 47 | ||||
-rw-r--r-- | ppapi/c/dev/ppp_policy_update_dev.h | 47 | ||||
-rw-r--r-- | ppapi/ppapi_cpp.gypi | 3 | ||||
-rw-r--r-- | ppapi/ppapi_shared.gypi | 1 | ||||
-rw-r--r-- | ppapi/ppapi_tests.gypi | 2 | ||||
-rw-r--r-- | ppapi/proxy/ppb_instance_proxy.cc | 5 | ||||
-rw-r--r-- | ppapi/proxy/ppb_instance_proxy.h | 1 | ||||
-rw-r--r-- | ppapi/tests/all_c_includes.h | 2 | ||||
-rw-r--r-- | ppapi/tests/test_query_policy.cc | 56 | ||||
-rw-r--r-- | ppapi/tests/test_query_policy.h | 30 | ||||
-rw-r--r-- | ppapi/thunk/interfaces_ppb_public_dev.h | 2 | ||||
-rw-r--r-- | ppapi/thunk/ppb_instance_api.h | 3 | ||||
-rw-r--r-- | ppapi/thunk/ppb_query_policy_thunk.cc | 33 | ||||
-rw-r--r-- | ppapi/thunk/thunk.h | 2 |
16 files changed, 0 insertions, 287 deletions
diff --git a/ppapi/api/dev/ppb_query_policy_dev.idl b/ppapi/api/dev/ppb_query_policy_dev.idl deleted file mode 100644 index 5d6bdf2..0000000 --- a/ppapi/api/dev/ppb_query_policy_dev.idl +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright (c) 2011 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. - */ - -/** - * This file defines the <code>PPB_QueryPolicy_Dev</code> interface. - */ -label Chrome { - M14 = 0.1 -}; - -interface PPB_QueryPolicy_Dev { - /** - * Subscribes the instance to receive updates via the - * <code>PPP_PolicyUpdate_Dev</code> interface. - * - * The plugin is guaranteed to get one update immediately via the - * <code>PP_PolicyUpdate_Dev</code> interface. This allows the plugin to - * retrieve the current policy when subscribing for the first time. - * - * @param[in] instance A <code>PP_Instance</code> indentifying one instance - * of a module. - */ - void SubscribeToPolicyUpdates([in] PP_Instance instance); -}; diff --git a/ppapi/api/dev/ppp_policy_update_dev.idl b/ppapi/api/dev/ppp_policy_update_dev.idl deleted file mode 100644 index f2f7512..0000000 --- a/ppapi/api/dev/ppp_policy_update_dev.idl +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (c) 2011 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. - */ - -/** - * This file defines the <code>PPP_PolicyUpdate_Dev</code> interface. - */ - -label Chrome { - M14 = 0.1 -}; - -interface PPP_PolicyUpdate_Dev { - /** - * Signals that the policy has been updated, and provides it via a JSON - * string. - * - * @param[in] instance A <code>PP_Instance</code> indentifying one instance - * of a module. - * @param[in] A <code>PP_Var</code> with a JSON string representing the - * encoded policy. - */ - void PolicyUpdated( - [in] PP_Instance instance, - [in] PP_Var policy_json); -}; diff --git a/ppapi/c/dev/ppb_query_policy_dev.h b/ppapi/c/dev/ppb_query_policy_dev.h deleted file mode 100644 index 46394aa..0000000 --- a/ppapi/c/dev/ppb_query_policy_dev.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright (c) 2011 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. - */ - -/* From dev/ppb_query_policy_dev.idl modified Tue Oct 4 08:47:29 2011. */ - -#ifndef PPAPI_C_DEV_PPB_QUERY_POLICY_DEV_H_ -#define PPAPI_C_DEV_PPB_QUERY_POLICY_DEV_H_ - -#include "ppapi/c/pp_instance.h" -#include "ppapi/c/pp_macros.h" -#include "ppapi/c/pp_stdint.h" - -#define PPB_QUERYPOLICY_DEV_INTERFACE_0_1 "PPB_QueryPolicy(Dev);0.1" -#define PPB_QUERYPOLICY_DEV_INTERFACE PPB_QUERYPOLICY_DEV_INTERFACE_0_1 - -/** - * @file - * This file defines the <code>PPB_QueryPolicy_Dev</code> interface. - */ - - -/** - * @addtogroup Interfaces - * @{ - */ -struct PPB_QueryPolicy_Dev { - /** - * Subscribes the instance to receive updates via the - * <code>PPP_PolicyUpdate_Dev</code> interface. - * - * The plugin is guaranteed to get one update immediately via the - * <code>PP_PolicyUpdate_Dev</code> interface. This allows the plugin to - * retrieve the current policy when subscribing for the first time. - * - * @param[in] instance A <code>PP_Instance</code> indentifying one instance - * of a module. - */ - void (*SubscribeToPolicyUpdates)(PP_Instance instance); -}; -/** - * @} - */ - -#endif /* PPAPI_C_DEV_PPB_QUERY_POLICY_DEV_H_ */ - diff --git a/ppapi/c/dev/ppp_policy_update_dev.h b/ppapi/c/dev/ppp_policy_update_dev.h deleted file mode 100644 index 83fa9b3..0000000 --- a/ppapi/c/dev/ppp_policy_update_dev.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright (c) 2011 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. - */ - -/* From dev/ppp_policy_update_dev.idl modified Tue Oct 4 09:58:59 2011. */ - -#ifndef PPAPI_C_DEV_PPP_POLICY_UPDATE_DEV_H_ -#define PPAPI_C_DEV_PPP_POLICY_UPDATE_DEV_H_ - -#include "ppapi/c/pp_bool.h" -#include "ppapi/c/pp_instance.h" -#include "ppapi/c/pp_macros.h" -#include "ppapi/c/pp_stdint.h" -#include "ppapi/c/pp_var.h" - -#define PPP_POLICYUPDATE_DEV_INTERFACE_0_1 "PPP_PolicyUpdate(Dev);0.1" -#define PPP_POLICYUPDATE_DEV_INTERFACE PPP_POLICYUPDATE_DEV_INTERFACE_0_1 - -/** - * @file - * This file defines the <code>PPP_PolicyUpdate_Dev</code> interface. - */ - - -/** - * @addtogroup Interfaces - * @{ - */ -struct PPP_PolicyUpdate_Dev { - /** - * Signals that the policy has been updated, and provides it via a JSON - * string. - * - * @param[in] instance A <code>PP_Instance</code> indentifying one instance - * of a module. - * @param[in] A <code>PP_Var</code> with a JSON string representing the - * encoded policy. - */ - void (*PolicyUpdated)(PP_Instance instance, struct PP_Var policy_json); -}; -/** - * @} - */ - -#endif /* PPAPI_C_DEV_PPP_POLICY_UPDATE_DEV_H_ */ - diff --git a/ppapi/ppapi_cpp.gypi b/ppapi/ppapi_cpp.gypi index 48378f7..923e890 100644 --- a/ppapi/ppapi_cpp.gypi +++ b/ppapi/ppapi_cpp.gypi @@ -72,7 +72,6 @@ 'c/dev/ppb_fullscreen_dev.h', 'c/dev/ppb_ime_input_event_dev.h', 'c/dev/ppb_memory_dev.h', - 'c/dev/ppb_query_policy_dev.h', 'c/dev/ppb_scrollbar_dev.h', 'c/dev/ppb_surface_3d_dev.h', 'c/dev/ppb_testing_dev.h', @@ -83,8 +82,6 @@ 'c/dev/ppp_cursor_control_dev.h', 'c/dev/ppp_find_dev.h', 'c/dev/ppp_network_state_dev.h', - 'c/dev/ppp_policy_update_dev.h', - 'c/dev/ppp_printing_dev.h', 'c/dev/ppp_scrollbar_dev.h', 'c/dev/ppp_selection_dev.h', 'c/dev/ppb_text_input_dev.h', diff --git a/ppapi/ppapi_shared.gypi b/ppapi/ppapi_shared.gypi index 06e3e67..b6399eb 100644 --- a/ppapi/ppapi_shared.gypi +++ b/ppapi/ppapi_shared.gypi @@ -149,7 +149,6 @@ 'thunk/ppb_messaging_thunk.cc', 'thunk/ppb_mouse_lock_thunk.cc', 'thunk/ppb_pdf_api.h', - 'thunk/ppb_query_policy_thunk.cc', 'thunk/ppb_scrollbar_api.h', 'thunk/ppb_scrollbar_thunk.cc', 'thunk/ppb_surface_3d_api.h', diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi index c7c51cf..b7999b3 100644 --- a/ppapi/ppapi_tests.gypi +++ b/ppapi/ppapi_tests.gypi @@ -114,8 +114,6 @@ 'tests/test_paint_aggregator.h', 'tests/test_post_message.cc', 'tests/test_post_message.h', - 'tests/test_query_policy.cc', - 'tests/test_query_policy.h', 'tests/test_scrollbar.cc', 'tests/test_scrollbar.h', 'tests/test_struct_sizes.c', diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc index 1a99b47..0d79df43 100644 --- a/ppapi/proxy/ppb_instance_proxy.cc +++ b/ppapi/proxy/ppb_instance_proxy.cc @@ -299,11 +299,6 @@ void PPB_Instance_Proxy::ZoomLimitsChanged(PP_Instance instance, NOTIMPLEMENTED(); } -void PPB_Instance_Proxy::SubscribeToPolicyUpdates(PP_Instance instance) { - // Not proxied yet. - NOTIMPLEMENTED(); -} - PP_Var PPB_Instance_Proxy::ResolveRelativeToDocument( PP_Instance instance, PP_Var relative, diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h index b22b6d1..3ba34c7 100644 --- a/ppapi/proxy/ppb_instance_proxy.h +++ b/ppapi/proxy/ppb_instance_proxy.h @@ -78,7 +78,6 @@ class PPB_Instance_Proxy : public InterfaceProxy, virtual void ZoomLimitsChanged(PP_Instance instance, double minimum_factor, double maximium_factor) OVERRIDE; - virtual void SubscribeToPolicyUpdates(PP_Instance instance) OVERRIDE; virtual PP_Var ResolveRelativeToDocument( PP_Instance instance, PP_Var relative, diff --git a/ppapi/tests/all_c_includes.h b/ppapi/tests/all_c_includes.h index b2e69c3..776d87a 100644 --- a/ppapi/tests/all_c_includes.h +++ b/ppapi/tests/all_c_includes.h @@ -26,7 +26,6 @@ #include "ppapi/c/dev/ppb_ime_input_event_dev.h" #include "ppapi/c/dev/ppb_layer_compositor_dev.h" #include "ppapi/c/dev/ppb_memory_dev.h" -#include "ppapi/c/dev/ppb_query_policy_dev.h" #include "ppapi/c/dev/ppb_scrollbar_dev.h" #include "ppapi/c/dev/ppb_surface_3d_dev.h" #include "ppapi/c/dev/ppb_testing_dev.h" @@ -41,7 +40,6 @@ #include "ppapi/c/dev/ppp_class_deprecated.h" #include "ppapi/c/dev/ppp_cursor_control_dev.h" #include "ppapi/c/dev/ppp_find_dev.h" -#include "ppapi/c/dev/ppp_policy_update_dev.h" #include "ppapi/c/dev/ppp_printing_dev.h" #include "ppapi/c/dev/ppp_scrollbar_dev.h" #include "ppapi/c/dev/ppp_selection_dev.h" diff --git a/ppapi/tests/test_query_policy.cc b/ppapi/tests/test_query_policy.cc deleted file mode 100644 index 87fba20..0000000 --- a/ppapi/tests/test_query_policy.cc +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) 2011 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 "ppapi/tests/test_query_policy.h" - -#include "ppapi/c/dev/ppb_query_policy_dev.h" -#include "ppapi/c/dev/ppp_policy_update_dev.h" -#include "ppapi/cpp/instance.h" -#include "ppapi/cpp/module.h" -#include "ppapi/cpp/var.h" -#include "ppapi/tests/test_utils.h" -#include "ppapi/tests/testing_instance.h" - -REGISTER_TEST_CASE(QueryPolicy); - -namespace { - -// Since this is a unittest, we don't care about a global string. -std::string g_received_policy; - -void PolicyUpdated(PP_Instance instance, PP_Var pp_policy_json) { - g_received_policy = pp::Var(pp::Var::DontManage(), pp_policy_json).AsString(); - GetTestingInterface()->QuitMessageLoop(instance); -} - -static PPP_PolicyUpdate_Dev policy_updated_interface = { - &PolicyUpdated, -}; - -} // namespace - -bool TestQueryPolicy::Init() { - query_policy_interface_ = static_cast<PPB_QueryPolicy_Dev const*>( - pp::Module::Get()->GetBrowserInterface(PPB_QUERYPOLICY_DEV_INTERFACE)); - pp::Module::Get()->AddPluginInterface(PPP_POLICYUPDATE_DEV_INTERFACE, - &policy_updated_interface); - - return query_policy_interface_ && InitTestingInterface(); -} - -void TestQueryPolicy::RunTest() { - RUN_TEST(SubscribeToPolicyUpdates); -} - -std::string TestQueryPolicy::TestSubscribeToPolicyUpdates() { - query_policy_interface_->SubscribeToPolicyUpdates( - instance_->pp_instance()); - - // Wait for a response on PPP_PolicyUpdate_Dev. - GetTestingInterface()->RunMessageLoop(instance_->pp_instance()); - - ASSERT_FALSE(g_received_policy.empty()); - - PASS(); -} diff --git a/ppapi/tests/test_query_policy.h b/ppapi/tests/test_query_policy.h deleted file mode 100644 index 436ae19..0000000 --- a/ppapi/tests/test_query_policy.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) 2011 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 PAPPI_TESTS_TEST_QUERY_POLICY_H_ -#define PAPPI_TESTS_TEST_QUERY_POLICY_H_ - -#include <string> - -#include "ppapi/tests/test_case.h" - -struct PPB_QueryPolicy_Dev; - -class TestQueryPolicy : public TestCase { - public: - explicit TestQueryPolicy(TestingInstance* instance) : TestCase(instance) {} - - // TestCase implementation. - virtual bool Init(); - virtual void RunTest(); - - private: - std::string TestGetFullPolicy(); - std::string TestSubscribeToPolicyUpdates(); - - // Used by the tests that access the C API directly. - const PPB_QueryPolicy_Dev* query_policy_interface_; -}; - -#endif // PAPPI_TESTS_TEST_BUFFER_H_ diff --git a/ppapi/thunk/interfaces_ppb_public_dev.h b/ppapi/thunk/interfaces_ppb_public_dev.h index 93ebce9..574c954 100644 --- a/ppapi/thunk/interfaces_ppb_public_dev.h +++ b/ppapi/thunk/interfaces_ppb_public_dev.h @@ -41,8 +41,6 @@ PROXIED_IFACE(PPB_FileChooser, PPB_FILECHOOSER_DEV_INTERFACE_0_5, PROXIED_IFACE(PPB_Font, PPB_FONT_DEV_INTERFACE_0_6, PPB_Font_Dev) PROXIED_IFACE(PPB_Instance, PPB_CHAR_SET_DEV_INTERFACE_0_4, PPB_CharSet_Dev) PROXIED_IFACE(PPB_Instance, PPB_CONSOLE_DEV_INTERFACE, PPB_Console_Dev) -UNPROXIED_IFACE(PPB_Instance, PPB_QUERYPOLICY_DEV_INTERFACE_0_1, - PPB_QueryPolicy_Dev) PROXIED_IFACE(PPB_Instance, PPB_URLUTIL_DEV_INTERFACE_0_6, PPB_URLUtil_Dev) UNPROXIED_IFACE(PPB_Instance, PPB_ZOOM_DEV_INTERFACE_0_2, PPB_Zoom_Dev) UNPROXIED_IFACE(PPB_LayerCompositor, PPB_LAYER_COMPOSITOR_DEV_INTERFACE_0_2, diff --git a/ppapi/thunk/ppb_instance_api.h b/ppapi/thunk/ppb_instance_api.h index 2cbd4da..e7444d0 100644 --- a/ppapi/thunk/ppb_instance_api.h +++ b/ppapi/thunk/ppb_instance_api.h @@ -83,9 +83,6 @@ class PPB_Instance_FunctionAPI { double minimum_factor, double maximium_factor) = 0; - // QueryPolicy. - virtual void SubscribeToPolicyUpdates(PP_Instance instance) = 0; - // URLUtil. virtual PP_Var ResolveRelativeToDocument( PP_Instance instance, diff --git a/ppapi/thunk/ppb_query_policy_thunk.cc b/ppapi/thunk/ppb_query_policy_thunk.cc deleted file mode 100644 index 24ef43b..0000000 --- a/ppapi/thunk/ppb_query_policy_thunk.cc +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) 2011 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 "ppapi/c/dev/ppb_query_policy_dev.h" -#include "ppapi/thunk/thunk.h" -#include "ppapi/thunk/enter.h" -#include "ppapi/thunk/ppb_instance_api.h" - -namespace ppapi { -namespace thunk { - -namespace { - -void SubscribeToPolicyUpdates(PP_Instance instance) { - EnterFunction<PPB_Instance_FunctionAPI> enter(instance, true); - if (enter.failed()) - return; - enter.functions()->SubscribeToPolicyUpdates(instance); -} - -const PPB_QueryPolicy_Dev g_ppb_querypolicy_thunk = { - &SubscribeToPolicyUpdates, -}; - -} // namespace - -const PPB_QueryPolicy_Dev* GetPPB_QueryPolicy_Dev_Thunk() { - return &g_ppb_querypolicy_thunk; -} - -} // namespace thunk -} // namespace ppapi diff --git a/ppapi/thunk/thunk.h b/ppapi/thunk/thunk.h index bac3a63..08b6f2d 100644 --- a/ppapi/thunk/thunk.h +++ b/ppapi/thunk/thunk.h @@ -41,7 +41,6 @@ struct PPB_Graphics3D; struct PPB_Graphics3DTrusted; struct PPB_ImageDataTrusted; struct PPB_Instance_Private; -struct PPB_QueryPolicy_Dev; struct PPB_URLLoaderTrusted; typedef PPB_Instance PPB_Instance_1_0; @@ -69,7 +68,6 @@ PPAPI_THUNK_EXPORT const PPB_Graphics3DTrusted* GetPPB_Graphics3DTrusted_Thunk(); PPAPI_THUNK_EXPORT const PPB_ImageDataTrusted* GetPPB_ImageDataTrusted_Thunk(); PPAPI_THUNK_EXPORT const PPB_Instance_Private* GetPPB_Instance_Private_Thunk(); -PPAPI_THUNK_EXPORT const PPB_QueryPolicy_Dev* GetPPB_QueryPolicy_Thunk(); PPAPI_THUNK_EXPORT const PPB_URLLoaderTrusted* GetPPB_URLLoaderTrusted_Thunk(); } // namespace thunk |