Revert 54955 - Merge 54514 ...

chrome/browser/extensions/extension_test_message_listener.cc

Index: chrome/browser/extensions/extension_test_message_listener.cc
===================================================================
--- chrome/browser/extensions/extension_test_message_listener.cc	(revision 54967)
+++ chrome/browser/extensions/extension_test_message_listener.cc	(working copy)
@@ -1,43 +0,0 @@
-// 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 "chrome/browser/extensions/extension_test_message_listener.h"
-
-#include "base/logging.h"
-#include "chrome/common/notification_service.h"
-#include "chrome/common/notification_type.h"
-#include "chrome/test/ui_test_utils.h"
-
-ExtensionTestMessageListener::ExtensionTestMessageListener(
-    const std::string& expected_message)
-    : expected_message_(expected_message), satisfied_(false),
-      waiting_(false) {
-  registrar_.Add(this, NotificationType::EXTENSION_TEST_MESSAGE,
-                 NotificationService::AllSources());
-}
-
-ExtensionTestMessageListener::~ExtensionTestMessageListener() {}
-
-bool ExtensionTestMessageListener::WaitUntilSatisfied()  {
-  if (satisfied_)
-    return true;
-  waiting_ = true;
-  ui_test_utils::RunMessageLoop();
-  return satisfied_;
-}
-
-void ExtensionTestMessageListener::Observe(
-    NotificationType type,
-    const NotificationSource& source,
-    const NotificationDetails& details) {
-  const std::string& content = *Details<std::string>(details).ptr();
-  if (!satisfied_ && content == expected_message_) {
-    satisfied_ = true;
-    registrar_.RemoveAll();  // Stop listening for more messages.
-    if (waiting_) {
-      waiting_ = false;
-      MessageLoopForUI::current()->Quit();
-    }
-  }
-}