[chromedriver] Remove Logger and just use base LOG.

chrome/test/chromedriver/logging_unittest.cc

Index: chrome/test/chromedriver/logging_unittest.cc
diff --git a/chrome/test/chromedriver/logging_unittest.cc b/chrome/test/chromedriver/logging_unittest.cc
index 4693f05a0aa0582d8a65b6b2b6d613e98fa44973..f3de397d8cf8fcedd50d6d4f045bc03faf772041 100644
--- a/chrome/test/chromedriver/logging_unittest.cc
+++ b/chrome/test/chromedriver/logging_unittest.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/test/chromedriver/logging.h"
-
 #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"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ -21,17 +21,15 @@ const char* const kAllWdLevels[] = {
 TEST(Logging, NameLevelConversionHappy) {
   // All names map to a valid enum value.
   for (int i = 0; static_cast<size_t>(i) < arraysize(kAllWdLevels); ++i) {
-    WebDriverLog::WebDriverLevel level =
-        static_cast<WebDriverLog::WebDriverLevel>(-1);
+    Log::Level level = static_cast<Log::Level>(-1);
     EXPECT_TRUE(WebDriverLog::NameToLevel(kAllWdLevels[i], &level));
-    EXPECT_LE(WebDriverLog::kWdAll, level);
-    EXPECT_GE(WebDriverLog::kWdOff, level);
+    EXPECT_LE(Log::kAll, level);
+    EXPECT_GE(Log::kOff, level);
   }
 }
 
 TEST(Logging, NameToLevelErrors) {
-  WebDriverLog::WebDriverLevel level =
-      static_cast<WebDriverLog::WebDriverLevel>(-1);
+  Log::Level level = static_cast<Log::Level>(-1);
   EXPECT_FALSE(WebDriverLog::NameToLevel("A", &level));
   EXPECT_FALSE(WebDriverLog::NameToLevel("B", &level));
   EXPECT_FALSE(WebDriverLog::NameToLevel("H", &level));
@@ -39,7 +37,7 @@ TEST(Logging, NameToLevelErrors) {
   EXPECT_FALSE(WebDriverLog::NameToLevel("T", &level));
   EXPECT_FALSE(WebDriverLog::NameToLevel("Z", &level));
   // The level variable was never modified.
-  EXPECT_EQ(static_cast<WebDriverLog::WebDriverLevel>(-1), level);
+  EXPECT_EQ(static_cast<Log::Level>(-1), level);
 }
 
 namespace {
@@ -61,11 +59,11 @@ void ValidateLogEntry(base::ListValue *entries,
   EXPECT_LT(0, timestamp);
 }
 
-}
+}  // namespace
 
 TEST(WebDriverLog, Levels) {
-  WebDriverLog log("type", WebDriverLog::kWdInfo);
-  log.AddEntry(Log::kLog, std::string("info message"));
+  WebDriverLog log("type", Log::kInfo);
+  log.AddEntry(Log::kInfo, std::string("info message"));
   log.AddEntry(Log::kError, "severe message");
   log.AddEntry(Log::kDebug, "debug message");  // Must not log
 
@@ -77,7 +75,7 @@ TEST(WebDriverLog, Levels) {
 }
 
 TEST(WebDriverLog, Off) {
-  WebDriverLog log("type", WebDriverLog::kWdOff);
+  WebDriverLog log("type", Log::kOff);
   log.AddEntry(Log::kError, "severe message");  // Must not log
   log.AddEntry(Log::kDebug, "debug message");  // Must not log
 
@@ -87,7 +85,7 @@ TEST(WebDriverLog, Off) {
 }
 
 TEST(WebDriverLog, All) {
-  WebDriverLog log("type", WebDriverLog::kWdAll);
+  WebDriverLog log("type", Log::kAll);
   log.AddEntry(Log::kError, "severe message");
   log.AddEntry(Log::kDebug, "debug message");
 
@@ -100,67 +98,45 @@ TEST(WebDriverLog, All) {
 
 TEST(Logging, CreatePerformanceLog) {
   Capabilities capabilities;
-  capabilities.logging_prefs.reset(new base::DictionaryValue());
-  capabilities.logging_prefs->SetString("performance", "INFO");
+  capabilities.logging_prefs["performance"] = Log::kInfo;
+  capabilities.logging_prefs["browser"] = Log::kInfo;
 
   ScopedVector<DevToolsEventListener> listeners;
   ScopedVector<WebDriverLog> logs;
-  Status status = CreateLogs(capabilities, &logs, &listeners);
+  scoped_ptr<WebDriverLog> driver_log;
+  Status status = CreateLogs(capabilities, &logs, &driver_log, &listeners);
   ASSERT_TRUE(status.IsOk());
   ASSERT_EQ(2u, logs.size());
   ASSERT_EQ(2u, listeners.size());
-  ASSERT_EQ("performance", logs[0]->GetType());
-  ASSERT_EQ("browser", logs[1]->GetType());  // Always created.
-}
-
-TEST(Logging, CreateBrowserLogOff) {
-  Capabilities capabilities;
-  capabilities.logging_prefs.reset(new base::DictionaryValue());
-  capabilities.logging_prefs->SetString("browser", "OFF");
-
-  ScopedVector<DevToolsEventListener> listeners;
-  ScopedVector<WebDriverLog> logs;
-  Status status = CreateLogs(capabilities, &logs, &listeners);
-  ASSERT_TRUE(status.IsOk());
-  ASSERT_EQ(1u, logs.size());
-  ASSERT_EQ(0u, listeners.size());
-  ASSERT_EQ("browser", logs[0]->GetType());
-
-  // Verify the created log is "OFF" -- drops all messages.
-  logs[0]->AddEntry(Log::kError, "drop even errors");
-  scoped_ptr<base::ListValue> entries(logs[0]->GetAndClearEntries());
-  ASSERT_EQ(0u, entries->GetSize());
+  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.reset(new base::DictionaryValue());
-  capabilities.logging_prefs->SetString("gaga", "INFO");
+  capabilities.logging_prefs["gaga"] = Log::kInfo;
 
   ScopedVector<DevToolsEventListener> listeners;
   ScopedVector<WebDriverLog> logs;
-  Status status = CreateLogs(capabilities, &logs, &listeners);
+  scoped_ptr<WebDriverLog> driver_log;
+  Status status = CreateLogs(capabilities, &logs, &driver_log, &listeners);
   EXPECT_TRUE(status.IsOk());
   ASSERT_EQ(1u, logs.size());
-  ASSERT_EQ(1u, listeners.size());
-  ASSERT_EQ("browser", logs[0]->GetType());
+  ASSERT_EQ(0u, listeners.size());
+  ASSERT_EQ("browser", logs[0]->type());
 }
 
-TEST(Logging, BrowserLogCreatedWithoutLoggingPrefs) {
+TEST(Logging, DefaultLogs) {
   Capabilities capabilities;
 
   ScopedVector<DevToolsEventListener> listeners;
   ScopedVector<WebDriverLog> logs;
-  Status status = CreateLogs(capabilities, &logs, &listeners);
+  scoped_ptr<WebDriverLog> driver_log;
+  Status status = CreateLogs(capabilities, &logs, &driver_log, &listeners);
   EXPECT_TRUE(status.IsOk());
   ASSERT_EQ(1u, logs.size());
-  ASSERT_EQ(1u, listeners.size());
-  ASSERT_EQ("browser", logs[0]->GetType());
-
-  // Verify the created "browser" log is "INFO" level.
-  logs[0]->AddEntry(Log::kLog, "info message");
-  logs[0]->AddEntry(Log::kDebug, "drop debug message");
-  scoped_ptr<base::ListValue> entries(logs[0]->GetAndClearEntries());
-  ASSERT_EQ(1u, entries->GetSize());
-  ValidateLogEntry(entries.get(), 0, "INFO", "info message");
+  ASSERT_EQ(0u, listeners.size());
+  ASSERT_EQ("driver", driver_log->type());
+  ASSERT_EQ(Log::kWarning, driver_log->min_level());
 }