From 3c10274043357ce9513962ae463f44250779899e Mon Sep 17 00:00:00 2001
From: "piman@chromium.org"
 <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 17 Aug 2012 20:08:11 +0000
Subject: Revert 151975 - 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


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

TBR=bauerb@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10854207

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

(limited to 'content')

diff --git a/content/common/np_channel_base.cc b/content/common/np_channel_base.cc
index 625677f..5640958 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()) {
-    VLOG(1) << "Channel is NULL; dropping message";
+    LOG(ERROR) << "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 05a5410..c05c20a 100644
--- a/content/renderer/webplugin_delegate_proxy.cc
+++ b/content/renderer/webplugin_delegate_proxy.cc
@@ -73,28 +73,6 @@ 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 {
@@ -191,8 +169,6 @@ class ResourceClientProxy : public webkit::npapi::WebPluginResourceClient {
   bool multibyte_response_expected_;
 };
 
-}  // namespace
-
 WebPluginDelegateProxy::WebPluginDelegateProxy(
     const std::string& mime_type,
     const base::WeakPtr<RenderViewImpl>& render_view)
@@ -343,15 +319,11 @@ bool WebPluginDelegateProxy::Initialize(
 #endif
 
   int instance_id;
-  {
-    // 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;
-    }
+  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;
@@ -384,7 +356,7 @@ bool WebPluginDelegateProxy::Initialize(
 
   plugin_ = plugin;
 
-  bool result = false;
+  result = false;
   IPC::Message* msg = new PluginMsg_Init(instance_id_, params, &result);
   Send(msg);
 
-- 
cgit v1.1