diff options
5 files changed, 3 insertions, 35 deletions
diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc index 43fcf7d..05ac5dd 100644 --- a/chrome/browser/component_updater/pepper_flash_component_installer.cc +++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc @@ -144,10 +144,6 @@ bool MakePepperFlashPluginInfo(const FilePath& flash_path, plugin_info->name = kFlashPluginName; plugin_info->permissions = kPepperFlashPermissions; - // TODO(brettw) bug 147507: remove this logging. - LOG(INFO) << "MakePepperFlashPluginInfo permissions = " - << plugin_info->permissions; - // The description is like "Shockwave Flash 10.2 r154". plugin_info->description = StringPrintf("%s %d.%d r%d", kFlashPluginName, ver_nums[0], ver_nums[1], ver_nums[2]); diff --git a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc index 7d5bd2d..dedd51e 100644 --- a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc +++ b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc @@ -4,7 +4,6 @@ #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" -#include "base/logging.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host.h" #include "ipc/ipc_message_macros.h" @@ -18,11 +17,6 @@ BrowserPpapiHostImpl::BrowserPpapiHostImpl( plugin_process_handle_(base::kNullProcessHandle) { ppapi_host_.AddHostFactoryFilter(scoped_ptr<ppapi::host::HostFactory>( new ContentBrowserPepperHostFactory(this))); - - // TODO(brettw) bug 147507: Remove this log statement when we figure out why - // permissions aren't hooked up properly. - LOG(INFO) << "BrowserPpapiHostImpl::BrowserPpapiHostImpl " - << "permissions = " << permissions.GetBits(); } BrowserPpapiHostImpl::~BrowserPpapiHostImpl() { diff --git a/content/common/pepper_plugin_registry.cc b/content/common/pepper_plugin_registry.cc index edb2622..259013b 100644 --- a/content/common/pepper_plugin_registry.cc +++ b/content/common/pepper_plugin_registry.cc @@ -6,7 +6,6 @@ #include "base/command_line.h" #include "base/file_util.h" -#include "base/logging.h" #include "base/native_library.h" #include "base/string_split.h" #include "base/string_util.h" @@ -99,11 +98,6 @@ webkit::WebPluginInfo content::PepperPluginInfo::ToWebPluginInfo() const { info.mime_types = mime_types; info.pepper_permissions = permissions; - // TODO(brettw) bug 147507: remove this logging. - LOG(INFO) << "PepperPluginInfo::ToWebPluginInfo \"" - << UTF16ToUTF8(info.path.LossyDisplayName()) << "\" " - << "permissions = " << permissions; - return info; } @@ -123,10 +117,6 @@ bool MakePepperPluginInfo(const webkit::WebPluginInfo& webplugin_info, pepper_info->mime_types = webplugin_info.mime_types; pepper_info->permissions = webplugin_info.pepper_permissions; - LOG(INFO) << "PepperPluginInfo::ToWebPluginInfo \"" - << UTF16ToUTF8(pepper_info->path.LossyDisplayName()) << "\" " - << "permissions = " << pepper_info->permissions; - return true; } @@ -235,11 +225,6 @@ PepperPluginRegistry::PepperPluginRegistry() { if (current.is_out_of_process) continue; // Out of process plugins need no special pre-initialization. - // TODO(brettw) bug 147507: Remove this logging. - LOG(INFO) << "PepperPluginRegistry::PepperPluginRegistry \"" - << UTF16ToUTF8(current.path.LossyDisplayName()) << "\" " - << " permissions =" << current.permissions; - scoped_refptr<webkit::ppapi::PluginModule> module = new webkit::ppapi::PluginModule(current.name, current.path, this, ppapi::PpapiPermissions(current.permissions)); diff --git a/content/renderer/pepper/content_renderer_pepper_host_factory.cc b/content/renderer/pepper/content_renderer_pepper_host_factory.cc index bf84e35..538fd9b 100644 --- a/content/renderer/pepper/content_renderer_pepper_host_factory.cc +++ b/content/renderer/pepper/content_renderer_pepper_host_factory.cc @@ -37,12 +37,9 @@ scoped_ptr<ResourceHost> ContentRendererPepperHostFactory::CreateResourceHost( // TODO(brettw) when we support any public or private interfaces, put them in // a separate switch above. - // TODO(brettw) bug 147507: put back this dev check and remove the log! This - // was removed to fix issue 138902 where the permissions for bundled Flash - // (but not Flash that you specify on the command line, making it difficult - // to test) are incorrect. - LOG(INFO) << "ContentRendererPepperHostFactory::CreateResourceHost " - << "permissions = " << GetPermissions().GetBits(); + // TODO(brettw) put back this dev check! This was removed to fix issue 138902 + // where the permissions for bundled Flash (but not Flash that you specify + // on the command line, making it difficult to test) are incorrect. /*if (GetPermissions().HasPermission(ppapi::PERMISSION_DEV))*/ { switch (message.type()) { case PpapiHostMsg_FileChooser_Create::ID: diff --git a/ppapi/shared_impl/ppapi_permissions.h b/ppapi/shared_impl/ppapi_permissions.h index d9d2cd8..8456fb7 100644 --- a/ppapi/shared_impl/ppapi_permissions.h +++ b/ppapi/shared_impl/ppapi_permissions.h @@ -40,10 +40,6 @@ class PPAPI_SHARED_EXPORT PpapiPermissions { bool HasPermission(Permission perm) const; - // TODO(brettw) bug 147507: Remove this when we fix the permissions bug - // (this was added for logging). - uint32 GetBits() const { return permissions_; } - private: uint32 permissions_; |