From 33c66e3473573743888019bd0e97eee01f548f81 Mon Sep 17 00:00:00 2001
From: "bauerb@chromium.org"
 <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 20 Aug 2012 22:10:08 +0000
Subject: Enable verbose logging during PluginMsg_CreateInstance.

This should get rid of the spurious ERROR messages when closing tabs, and log backtraces when we need them.

BUG=141055


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=151975

Review URL: https://chromiumcodereview.appspot.com/10834355

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152395 0039d316-1c4b-4281-b951-d872f2087c98
---
 content/common/np_channel_base.cc            |  2 +-
 content/renderer/webplugin_delegate_proxy.cc | 40 +++++++++++++++++++++++-----
 2 files changed, 35 insertions(+), 7 deletions(-)

(limited to 'content')

diff --git a/content/common/np_channel_base.cc b/content/common/np_channel_base.cc
index 5640958..625677f 100644
--- a/content/common/np_channel_base.cc
+++ b/content/common/np_channel_base.cc
@@ -141,7 +141,7 @@ bool NPChannelBase::Init(base::MessageLoopProxy* ipc_message_loop,
 
 bool NPChannelBase::Send(IPC::Message* message) {
   if (!channel_.get()) {
-    LOG(ERROR) << "Channel is NULL; dropping message";
+    VLOG(1) << "Channel is NULL; dropping message";
     delete message;
     return false;
   }
diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc
index c05c20a..05a5410 100644
--- a/content/renderer/webplugin_delegate_proxy.cc
+++ b/content/renderer/webplugin_delegate_proxy.cc
@@ -73,6 +73,28 @@ using WebKit::WebInputEvent;
 using WebKit::WebString;
 using WebKit::WebView;
 
+namespace {
+
+class ScopedLogLevel {
+ public:
+  ScopedLogLevel(int level);
+  ~ScopedLogLevel();
+
+ private:
+  int old_level_;
+
+  DISALLOW_COPY_AND_ASSIGN(ScopedLogLevel);
+};
+
+ScopedLogLevel::ScopedLogLevel(int level)
+    : old_level_(logging::GetMinLogLevel()) {
+  logging::SetMinLogLevel(level);
+}
+
+ScopedLogLevel::~ScopedLogLevel() {
+  logging::SetMinLogLevel(old_level_);
+}
+
 // Proxy for WebPluginResourceClient.  The object owns itself after creation,
 // deleting itself after its callback has been called.
 class ResourceClientProxy : public webkit::npapi::WebPluginResourceClient {
@@ -169,6 +191,8 @@ class ResourceClientProxy : public webkit::npapi::WebPluginResourceClient {
   bool multibyte_response_expected_;
 };
 
+}  // namespace
+
 WebPluginDelegateProxy::WebPluginDelegateProxy(
     const std::string& mime_type,
     const base::WeakPtr<RenderViewImpl>& render_view)
@@ -319,11 +343,15 @@ bool WebPluginDelegateProxy::Initialize(
 #endif
 
   int instance_id;
-  bool result = channel_host->Send(new PluginMsg_CreateInstance(
-      mime_type_, &instance_id));
-  if (!result) {
-    LOG(ERROR) << "Couldn't send PluginMsg_CreateInstance";
-    return false;
+  {
+    // TODO(bauerb): Debugging for http://crbug.com/141055.
+    ScopedLogLevel log_level(-2);  // Equivalent to --v=2
+    bool result = channel_host->Send(new PluginMsg_CreateInstance(
+        mime_type_, &instance_id));
+    if (!result) {
+      LOG(ERROR) << "Couldn't send PluginMsg_CreateInstance";
+      return false;
+    }
   }
 
   channel_host_ = channel_host;
@@ -356,7 +384,7 @@ bool WebPluginDelegateProxy::Initialize(
 
   plugin_ = plugin;
 
-  result = false;
+  bool result = false;
   IPC::Message* msg = new PluginMsg_Init(instance_id_, params, &result);
   Send(msg);
 
-- 
cgit v1.1