Revert 141482 - Pepper Flash settings integration - camera and microphone.

ppapi/proxy/ppapi_messages.h

 // Copyright (c) 2012 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.
 
 // Multiply-included message header, no traditional include guard.
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
@@ skipping 27 matching lines @@
 #include "ppapi/proxy/ppapi_param_traits.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/proxy/serialized_flash_menu.h"
 #include "ppapi/proxy/serialized_structs.h"
 #include "ppapi/shared_impl/ppapi_preferences.h"
 #include "ppapi/shared_impl/ppb_device_ref_shared.h"
 #include "ppapi/shared_impl/ppb_input_event_shared.h"
 #include "ppapi/shared_impl/ppb_network_list_private_shared.h"
 #include "ppapi/shared_impl/ppb_url_request_info_shared.h"
 #include "ppapi/shared_impl/ppb_view_shared.h"
-#include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h"
 #include "ppapi/shared_impl/private/ppb_host_resolver_shared.h"
 #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT
 
 #define IPC_MESSAGE_START PpapiMsgStart
 
 IPC_ENUM_TRAITS(PP_DeviceType_Dev)
 IPC_ENUM_TRAITS(PP_Flash_BrowserOperations_Permission)
@@ skipping 53 matching lines @@
   IPC_STRUCT_TRAITS_MEMBER(family)
   IPC_STRUCT_TRAITS_MEMBER(flags)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(ppapi::DeviceRefData)
   IPC_STRUCT_TRAITS_MEMBER(type)
   IPC_STRUCT_TRAITS_MEMBER(name)
   IPC_STRUCT_TRAITS_MEMBER(id)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(ppapi::FlashSiteSetting)
-  IPC_STRUCT_TRAITS_MEMBER(site)
-  IPC_STRUCT_TRAITS_MEMBER(permission)
-IPC_STRUCT_TRAITS_END()
-
 IPC_STRUCT_TRAITS_BEGIN(ppapi::ViewData)
   IPC_STRUCT_TRAITS_MEMBER(rect)
   IPC_STRUCT_TRAITS_MEMBER(is_fullscreen)
   IPC_STRUCT_TRAITS_MEMBER(is_page_visible)
   IPC_STRUCT_TRAITS_MEMBER(clip_rect)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(ppapi::Preferences)
   IPC_STRUCT_TRAITS_MEMBER(standard_font_family_map)
   IPC_STRUCT_TRAITS_MEMBER(fixed_font_family_map)
@@ skipping 132 matching lines @@
 IPC_MESSAGE_CONTROL1(PpapiHostMsg_ClearSiteDataResult,
                      bool /* success */)
 
 IPC_MESSAGE_CONTROL2(PpapiMsg_DeauthorizeContentLicenses,
                      uint32 /* request_id */,
                      FilePath /* plugin_data_path */)
 IPC_MESSAGE_CONTROL2(PpapiHostMsg_DeauthorizeContentLicensesResult,
                      uint32 /* request_id */,
                      bool /* success */)
 
-IPC_MESSAGE_CONTROL3(PpapiMsg_GetPermissionSettings,
-                     uint32 /* request_id */,
-                     FilePath /* plugin_data_path */,
-                     PP_Flash_BrowserOperations_SettingType /* setting_type */)
-IPC_MESSAGE_CONTROL4(
-    PpapiHostMsg_GetPermissionSettingsResult,
-    uint32 /* request_id */,
-    bool /* success */,
-    PP_Flash_BrowserOperations_Permission /* default_permission */,
-    ppapi::FlashSiteSettings /* sites */)
-
-IPC_MESSAGE_CONTROL5(PpapiMsg_SetDefaultPermission,
-                     uint32 /* request_id */,
-                     FilePath /* plugin_data_path */,
-                     PP_Flash_BrowserOperations_SettingType /* setting_type */,
-                     PP_Flash_BrowserOperations_Permission /* permission */,
-                     bool /* clear_site_specific */)
-IPC_MESSAGE_CONTROL2(PpapiHostMsg_SetDefaultPermissionResult,
-                     uint32 /* request_id */,
-                     bool /* success */)
-
-IPC_MESSAGE_CONTROL4(PpapiMsg_SetSitePermission,
-                     uint32 /* request_id */,
-                     FilePath /* plugin_data_path */,
-                     PP_Flash_BrowserOperations_SettingType /* setting_type */,
-                     ppapi::FlashSiteSettings /* sites */)
-IPC_MESSAGE_CONTROL2(PpapiHostMsg_SetSitePermissionResult,
-                     uint32 /* request_id */,
-                     bool /* success */)
-
 // Broker Process.
 IPC_SYNC_MESSAGE_CONTROL2_1(PpapiMsg_ConnectToPlugin,
                             PP_Instance /* instance */,
                             IPC::PlatformFileForTransit /* handle */,
                             int32_t /* result */)
 #endif  // !defined(OS_NACL)
 
 // PPB_Audio.
 
 // Notifies the result of the audio stream create call. This is called in
@@ skipping 1039 matching lines @@
 // PPB_X509Certificate_Private
 IPC_SYNC_MESSAGE_CONTROL1_2(PpapiHostMsg_PPBX509Certificate_ParseDER,
                             std::vector<char> /* der */,
                             bool /* succeeded */,
                             ppapi::PPB_X509Certificate_Fields /* result */)
 
 // PPB_Font.
 IPC_SYNC_MESSAGE_CONTROL0_1(PpapiHostMsg_PPBFont_GetFontFamilies,
                             std::string /* result */)
 #endif  // !defined(OS_NACL)