Revert 283003 "[ChromeDriver] Subscribe PerformanceLogger to Com..."

trunk/src/chrome/test/chromedriver/logging_unittest.cc

 // Copyright (c) 2013 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 "base/values.h"
 #include "chrome/test/chromedriver/capabilities.h"
 #include "chrome/test/chromedriver/chrome/devtools_event_listener.h"
 #include "chrome/test/chromedriver/chrome/log.h"
 #include "chrome/test/chromedriver/chrome/status.h"
-#include "chrome/test/chromedriver/command_listener.h"
 #include "chrome/test/chromedriver/logging.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const char* const kAllWdLevels[] = {
   "ALL", "DEBUG", "INFO", "WARNING", "SEVERE", "OFF"
 };
 
 }
@@ skipping 74 matching lines @@
   ASSERT_EQ(2u, entries->GetSize());
   ValidateLogEntry(entries.get(), 0, "SEVERE", "severe message");
   ValidateLogEntry(entries.get(), 1, "DEBUG", "debug message");
 }
 
 TEST(Logging, CreatePerformanceLog) {
   Capabilities capabilities;
   capabilities.logging_prefs["performance"] = Log::kInfo;
   capabilities.logging_prefs["browser"] = Log::kInfo;
 
-  ScopedVector<DevToolsEventListener> devtools_listeners;
+  ScopedVector<DevToolsEventListener> listeners;
   ScopedVector<WebDriverLog> logs;
-  ScopedVector<CommandListener> command_listeners;
-  Status status = CreateLogs(capabilities, &logs, &devtools_listeners,
-                             &command_listeners);
+  Status status = CreateLogs(capabilities, &logs, &listeners);
   ASSERT_TRUE(status.IsOk());
   ASSERT_EQ(2u, logs.size());
-  ASSERT_EQ(2u, devtools_listeners.size());
-  ASSERT_EQ(1u, command_listeners.size());
+  ASSERT_EQ(2u, listeners.size());
   ASSERT_EQ("performance", logs[0]->type());
   ASSERT_EQ("browser", logs[1]->type());
 }
 
 TEST(Logging, IgnoreUnknownLogType) {
   Capabilities capabilities;
   capabilities.logging_prefs["gaga"] = Log::kInfo;
 
-  ScopedVector<DevToolsEventListener> devtools_listeners;
+  ScopedVector<DevToolsEventListener> listeners;
   ScopedVector<WebDriverLog> logs;
-  ScopedVector<CommandListener> command_listeners;
-  Status status = CreateLogs(capabilities, &logs, &devtools_listeners,
-                             &command_listeners);
+  Status status = CreateLogs(capabilities, &logs, &listeners);
   EXPECT_TRUE(status.IsOk());
   ASSERT_EQ(1u, logs.size());
-  ASSERT_EQ(1u, devtools_listeners.size());
-  ASSERT_EQ(0u, command_listeners.size());
+  ASSERT_EQ(1u, listeners.size());
   ASSERT_EQ("browser", logs[0]->type());
 }
 
 TEST(Logging, DefaultLogs) {
   Capabilities capabilities;
 
-  ScopedVector<DevToolsEventListener> devtools_listeners;
+  ScopedVector<DevToolsEventListener> listeners;
   ScopedVector<WebDriverLog> logs;
-  ScopedVector<CommandListener> command_listeners;
-  Status status = CreateLogs(capabilities, &logs, &devtools_listeners,
-                             &command_listeners);
+  Status status = CreateLogs(capabilities, &logs, &listeners);
   EXPECT_TRUE(status.IsOk());
   ASSERT_EQ(1u, logs.size());
-  ASSERT_EQ(1u, devtools_listeners.size());
-  ASSERT_EQ(0u, command_listeners.size());
+  ASSERT_EQ(1u, listeners.size());
   ASSERT_EQ("browser", logs[0]->type());
 }
 
 TEST(Logging, GetFirstErrorMessage) {
   WebDriverLog log(WebDriverLog::kBrowserType, Log::kAll);
   std::string entry;
 
   entry = log.GetFirstErrorMessage();
   ASSERT_TRUE(entry.empty());
 
   log.AddEntry(Log::kInfo, "info message");
   log.AddEntry(Log::kError, "first error message");
   log.AddEntry(Log::kDebug, "debug message");
   log.AddEntry(Log::kError, "second error message");
 
   entry = log.GetFirstErrorMessage();
   ASSERT_EQ("first error message", entry);
 }