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

content/renderer/webplugin_delegate_proxy.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/renderer/webplugin_delegate_proxy.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #elif defined(USE_X11)
 #include <cairo/cairo.h>
@@ skipping 41 matching lines @@
 #include "webkit/plugins/npapi/plugin_group.h"
 #include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/plugins/plugin_constants.h"
 #include "webkit/plugins/sad_plugin.h"
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
 #endif
 
 #if defined(OS_MACOSX)
-#include "base/mac/crash_logging.h"
 #include "base/mac/mac_util.h"
-#include "base/sys_string_conversions.h"
-#include "content/public/common/content_debug_logging.h"
 #endif
 
 #if defined(OS_WIN)
 #include "content/public/common/sandbox_init.h"
 #endif
 
 using WebKit::WebBindings;
 using WebKit::WebCursorInfo;
 using WebKit::WebDragData;
 using WebKit::WebInputEvent;
@@ skipping 111 matching lines @@
 
  private:
   scoped_refptr<PluginChannelHost> channel_;
   int instance_id_;
   unsigned long resource_id_;
   // Set to true if the response expected is a multibyte response.
   // For e.g. response for a HTTP byte range request.
   bool multibyte_response_expected_;
 };
 
-#if defined(OS_MACOSX)
-// Helper to load the breakpad information for the given bug, and also
-// log errors.
-void LoadKeysAndLogForBug(int bug_id) {
-  std::vector<std::string> messages;
-
-  CHECK(content::debug::GetMessages(bug_id, &messages));
-  for (size_t i = 0; i < messages.size(); i++) {
-    std::string key(base::StringPrintf("bug-%d-%lu", bug_id, i));
-    base::mac::SetCrashKeyValue(base::SysUTF8ToNSString(key),
-                                base::SysUTF8ToNSString(messages[i]));
-    LOG(ERROR) << "messages-" << bug_id << "[" << i << "]: " << messages[i];
-  }
-}
-#endif
-
 }  // namespace
 
 WebPluginDelegateProxy::WebPluginDelegateProxy(
     const std::string& mime_type,
     const base::WeakPtr<RenderViewImpl>& render_view)
     : render_view_(render_view),
       plugin_(NULL),
       uses_shared_bitmaps_(false),
 #if defined(OS_MACOSX)
       uses_compositor_(false),
@@ skipping 114 matching lines @@
     scoped_ptr<AutoReset<bool> > track_nested_removes(new AutoReset<bool>(
         PluginChannelHost::GetRemoveTrackingFlag(), true));
 #endif
 
     IPC::ChannelHandle channel_handle;
     if (!RenderThreadImpl::current()->Send(new ViewHostMsg_OpenChannelToPlugin(
             render_view_->routing_id(), url, page_url_, mime_type_,
             &channel_handle, &info_))) {
       continue;
     }
-#if defined(OS_MACOSX)
-    content::debug::RecordMsg(97285, base::StringPrintf(
-        "OpenChannelToPlugin() {%s, %d}",
-        channel_handle.name.c_str(), channel_handle.socket.fd));
-#endif
 
     if (channel_handle.name.empty()) {
       // We got an invalid handle.  Either the plugin couldn't be found (which
       // shouldn't happen, since if we got here the plugin should exist) or the
       // plugin crashed on initialization.
       if (!info_.path.empty()) {
         render_view_->PluginCrashed(info_.path);
         LOG(ERROR) << "Plug-in crashed on start";
 
         // Return true so that the plugin widget is created and we can paint the
         // crashed plugin there.
         return true;
       }
       LOG(ERROR) << "Plug-in couldn't be found";
       return false;
     }
 
     channel_host =
         PluginChannelHost::GetPluginChannelHost(
             channel_handle, ChildProcess::current()->io_message_loop_proxy());
     if (!channel_host.get()) {
-#if defined(OS_MACOSX)
-      if (channel_handle.socket.fd == -1) {
-        LOG(ERROR) << "http://crbug.com/97285 detected.";
-        LoadKeysAndLogForBug(97285);
-
-        // Upload the data.  This crash used to be in NPChannelBase::Init().
-        // This point can only be MODE_CLIENT.
-        CHECK_NE(channel_handle.socket.fd, -1);
-      }
-#endif
       LOG(ERROR) << "Couldn't get PluginChannelHost";
       continue;
     }
 #if defined(OS_MACOSX)
-    content::debug::RecordMsg(141055, base::StringPrintf(
-        "GetPCH() {%s, %d} from {*, %d}, %svalid",
-        channel_host->channel_handle().name.c_str(),
-        channel_host->channel_handle().socket.fd,
-        channel_handle.socket.fd,
-        channel_host->channel_valid() ? "" : "in"));
     track_nested_removes.reset();
 #endif
 
     {
       // TODO(bauerb): Debugging for http://crbug.com/141055.
-#if defined(OS_MACOSX)
       ScopedLogLevel log_level(-2);  // Equivalent to --v=2
-#endif
       result = channel_host->Send(new PluginMsg_CreateInstance(
           mime_type_, &instance_id));
       if (!result) {
-#if defined(OS_MACOSX)
-        // Don't crash, but load the info into breakpad on the off
-        // chance that the renderer will crash in the future.  Even if
-        // it doesn't, the log messages might be reported.
-        // TODO(shess): The renderer may not survive long enough to
-        // crash.  Could have the browser load breakpad instead.
-        LOG(ERROR) << "http://crbug.com/141055 possibly detected.";
-        LoadKeysAndLogForBug(141055);
-        LoadKeysAndLogForBug(97285);
-#endif
-
         LOG(ERROR) << "Couldn't send PluginMsg_CreateInstance";
         continue;
       }
     }
   }
 
   // Failed too often, give up.
   if (!result)
     return false;
 
@@ skipping 1156 matching lines @@
 }
 #endif
 
 void WebPluginDelegateProxy::OnURLRedirectResponse(bool allow,
                                                    int resource_id) {
   if (!plugin_)
     return;
 
   plugin_->URLRedirectResponse(allow, resource_id);
 }