[chromedriver] Logging tweaks and fixes.

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/logging.h"
@@ skipping 85 matching lines @@
   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> listeners;
   ScopedVector<WebDriverLog> logs;
-  scoped_ptr<WebDriverLog> driver_log;
-  Status status = CreateLogs(capabilities, &logs, &driver_log, &listeners);
+  Status status = CreateLogs(capabilities, &logs, &listeners);
   ASSERT_TRUE(status.IsOk());
   ASSERT_EQ(2u, logs.size());
   ASSERT_EQ(2u, listeners.size());
   ASSERT_EQ("performance", logs[0]->type());
   ASSERT_EQ("browser", logs[1]->type());
-  ASSERT_EQ("driver", driver_log->type());
 }
 
 TEST(Logging, IgnoreUnknownLogType) {
   Capabilities capabilities;
   capabilities.logging_prefs["gaga"] = Log::kInfo;
 
   ScopedVector<DevToolsEventListener> listeners;
   ScopedVector<WebDriverLog> logs;
-  scoped_ptr<WebDriverLog> driver_log;
-  Status status = CreateLogs(capabilities, &logs, &driver_log, &listeners);
+  Status status = CreateLogs(capabilities, &logs, &listeners);
   EXPECT_TRUE(status.IsOk());
   ASSERT_EQ(1u, logs.size());
   ASSERT_EQ(0u, listeners.size());
   ASSERT_EQ("browser", logs[0]->type());
 }
 
 TEST(Logging, DefaultLogs) {
   Capabilities capabilities;
 
   ScopedVector<DevToolsEventListener> listeners;
   ScopedVector<WebDriverLog> logs;
-  scoped_ptr<WebDriverLog> driver_log;
-  Status status = CreateLogs(capabilities, &logs, &driver_log, &listeners);
+  Status status = CreateLogs(capabilities, &logs, &listeners);
   EXPECT_TRUE(status.IsOk());
   ASSERT_EQ(1u, logs.size());
   ASSERT_EQ(0u, listeners.size());
-  ASSERT_EQ("driver", driver_log->type());
-  ASSERT_EQ(Log::kWarning, driver_log->min_level());
 }