Revert 155122 - Code to collect issue 97285 debugging info for crash reports.

content/plugin/plugin_thread.cc

 // 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.
 
 #include "content/plugin/plugin_thread.h"
 
 #include "build/build_config.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #elif defined(OS_MACOSX)
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/process_util.h"
 #include "base/threading/thread_local.h"
 #include "content/common/child_process.h"
 #include "content/common/npobject_util.h"
 #include "content/common/plugin_messages.h"
-#include "content/public/common/content_debug_logging.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/plugin/content_plugin_client.h"
 #include "ipc/ipc_channel_handle.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/npapi/plugin_lib.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 #if defined(TOOLKIT_GTK)
 #include "ui/gfx/gtk_util.h"
@@ skipping 25 matching lines @@
         base::Bind(&EnsureTerminateMessageFilter::Terminate, this),
         kPluginProcessTerminateTimeout);
   }
 
  private:
   void Terminate() {
     base::KillProcess(base::GetCurrentProcessHandle(), 0, false);
   }
 };
 
-void RecordMsg(int bug_id, const std::string& msg) {
-  PluginThread::current()->Send(
-      new PluginProcessHostMsg_ContentDebugRecordMsg(bug_id, msg));
-}
-
-bool GetMessages(int bug_id, std::vector<std::string>* msgs) {
-  bool handled = false;
-  PluginThread::current()->Send(
-      new PluginProcessHostMsg_ContentDebugGetMessages(
-          bug_id, &handled, msgs));
-  return handled;
-}
-
 }  // namespace
 
 static base::LazyInstance<base::ThreadLocalPointer<PluginThread> > lazy_tls =
     LAZY_INSTANCE_INITIALIZER;
 
 PluginThread::PluginThread()
     : preloaded_plugin_module_(NULL) {
   FilePath plugin_path = CommandLine::ForCurrentProcess()->GetSwitchValuePath(
       switches::kPluginPath);
 
@@ skipping 19 matching lines @@
 
     // GTK after 2.18 resets the environment variable.  But if we're using
     // nspluginwrapper, that means it'll spawn its subprocess without the
     // environment variable!  So set it again.
     setenv("GDK_NATIVE_WINDOWS", "1", 1);
   }
 
   ui::SetDefaultX11ErrorHandlers();
 #endif
 
-  content::debug::RegisterMessageHandlers(RecordMsg, GetMessages);
-
   PatchNPNFunctions();
 
   // Preload the library to avoid loading, unloading then reloading
   preloaded_plugin_module_ = base::LoadNativeLibrary(plugin_path, NULL);
 
   scoped_refptr<webkit::npapi::PluginLib> plugin(
       webkit::npapi::PluginLib::CreatePluginLib(plugin_path));
   if (plugin.get()) {
     plugin->NP_Initialize();
     // For OOP plugins the plugin dll will be unloaded during process shutdown
@@ skipping 50 matching lines @@
   if (channel.get()) {
     channel_handle.name = channel->channel_handle().name;
 #if defined(OS_POSIX)
     // On POSIX, pass the renderer-side FD.
     channel_handle.socket =
         base::FileDescriptor(channel->TakeRendererFileDescriptor(), true);
 #endif
     channel->set_incognito(incognito);
   }
 
-#if defined(OS_MACOSX)
-  content::debug::RecordMsg(97285, base::StringPrintf(
-      "OnCreateChannel({%s, %d})",
-      channel_handle.name.c_str(), channel_handle.socket.fd));
-#endif
   Send(new PluginProcessHostMsg_ChannelCreated(channel_handle));
 }
 
 void PluginThread::OnNotifyRenderersOfPendingShutdown() {
   PluginChannel::NotifyRenderersOfPendingShutdown();
 }