Revert "Temporary CL to debug test failure on the buildbot."

This reverts commit 5c19b0409f047111de901755b5670efa5a2d4e8c.

Review URL: http://codereview.chromium.org/1517020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43863 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 23 deletions

diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc
index 35ec8a6..e45efd5 100644
--- a/chrome/browser/extensions/extension_browsertests_misc.cc
+++ b/chrome/browser/extensions/extension_browsertests_misc.cc
@@ -678,12 +678,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenNoPrivileges) {
 #define MAYBE_PluginLoadUnload DISABLED_PluginLoadUnload
 #else
 // TODO(mpcomplete): http://crbug.com/40588 reenable after fixing.
-#define MAYBE_PluginLoadUnload PluginLoadUnload
+#define MAYBE_PluginLoadUnload DISABLED_PluginLoadUnload
 #endif
 
-#include <iostream>
-using namespace std;
-
 // Tests that a renderer's plugin list is properly updated when we load and
 // unload an extension that contains a plugin.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) {
@@ -702,9 +699,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) {
 
   ExtensionsService* service = browser()->profile()->GetExtensionsService();
   const size_t size_before = service->extensions()->size();
-  std::cout << "@@ LoadExtension1" << endl;
   ASSERT_TRUE(LoadExtension(extension_dir));
-  std::cout << "@@ LoadExtension1e" << endl;
   EXPECT_EQ(size_before + 1, service->extensions()->size());
   // Now the plugin should be in the cache, but we have to reload the page for
   // it to work.
@@ -718,9 +713,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) {
   EXPECT_TRUE(result);
 
   EXPECT_EQ(size_before + 1, service->extensions()->size());
-  std::cout << "@@ UnloadExtension" << endl;
   UnloadExtension(service->extensions()->at(size_before)->id());
-  std::cout << "@@ UnloadExtensione" << endl;
   EXPECT_EQ(size_before, service->extensions()->size());
 
   // Now the plugin should be unloaded, and the page should be broken.
@@ -731,19 +724,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) {
 
   // If we reload the extension and page, it should work again.
 
-  std::cout << "@@ LoadExtension2" << endl;
   ASSERT_TRUE(LoadExtension(extension_dir));
-  std::cout << "@@ LoadExtension2e" << endl;
   EXPECT_EQ(size_before + 1, service->extensions()->size());
-  std::cout << "@@ Reloading" << endl;
   browser()->Reload();
-  std::cout << "@@ Waiting: " << tab << " vs " <<
-      browser()->GetSelectedTabContents() << endl;
   ui_test_utils::WaitForNavigationInCurrentTab(browser());
-  std::cout << "@@ Executing JS" << endl;
-  bool retval = ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  ui_test_utils::ExecuteJavaScriptAndExtractBool(
       tab->render_view_host(), L"", L"testPluginWorks()", &result);
-  std::cout << "@@ Executed: " << retval << endl;
   EXPECT_TRUE(result);
 }
 
diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc
index de7e744..f16108d 100644
--- a/chrome/browser/plugin_service.cc
+++ b/chrome/browser/plugin_service.cc
@@ -1,8 +1,6 @@
 // Copyright (c) 2010 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 <iostream>
-using namespace std;
 
 #include "build/build_config.h"
 
@@ -219,8 +217,6 @@ PluginProcessHost* PluginService::FindOrStartPluginProcess(
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
 
   PluginProcessHost *plugin_host = FindPluginProcess(plugin_path);
-  std::cout << "Starting plugin: " << plugin_path.ToWStringHack()
-      << " = " << plugin_host << endl;
   if (plugin_host)
     return plugin_host;
 
@@ -231,8 +227,6 @@ PluginProcessHost* PluginService::FindOrStartPluginProcess(
     return NULL;
   }
 
-  std::cout << "Starting plugin info: " << info.name << endl;
-
   // This plugin isn't loaded by any plugin process, so create a new process.
   plugin_host = new PluginProcessHost();
   if (!plugin_host->Init(info, ui_locale_)) {
@@ -303,7 +297,6 @@ void PluginService::OnWaitableEventSignaled(
 static void ForceShutdownPlugin(const FilePath& plugin_path) {
   PluginProcessHost* plugin =
       PluginService::GetInstance()->FindPluginProcess(plugin_path);
-  std::cout << "Shutting down:" << plugin << endl;
   if (plugin)
     plugin->ForceShutdown();
 }