Logging API in chromedriver2.

chrome/test/chromedriver/capabilities.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 "chrome/test/chromedriver/capabilities.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 183 matching lines @@
       if (!android_package_value->GetAsString(&capabilities->android_package) ||
           capabilities->android_package.empty()) {
         return Status(kUnknownError,
                       "'androidPackage' must be a non-empty string");
       }
     }
   }
   return Status(kOk);
 }
 
+Status ParseLoggingPrefs(const base::DictionaryValue& desired_caps,
+                         Capabilities* capabilities) {
+  const base::Value* logging_prefs = NULL;
+  if (desired_caps.Get("loggingPrefs", &logging_prefs)) {
+    const base::DictionaryValue* logging_prefs_dict = NULL;
+    if (!logging_prefs->GetAsDictionary(&logging_prefs_dict)) {
+      return Status(kUnknownError, "'loggingPrefs' must be a dictionary");
+    }
+    // TODO(klm): verify log types.
+    // TODO(klm): verify log levels.
+    capabilities->logging_prefs.reset(logging_prefs_dict->DeepCopy());
+  }
+  return Status(kOk);
+}
+
 }  // namespace
 
 Capabilities::Capabilities() : command(CommandLine::NO_PROGRAM) {}
 
 Capabilities::~Capabilities() {}
 
 bool Capabilities::IsAndroid() const {
   return !android_package.empty();
 }
 
 Status Capabilities::Parse(const base::DictionaryValue& desired_caps) {
-  Status status = ParseAndroidChromeCapabilities(desired_caps, this);
+  Status status = ParseLoggingPrefs(desired_caps, this);
+  if (status.IsError())
+    return status;
+  status = ParseAndroidChromeCapabilities(desired_caps, this);
   if (status.IsError())
     return status;
   if (IsAndroid())
     return Status(kOk);
 
   std::map<std::string, Parser> parser_map;
   parser_map["proxy"] = base::Bind(&ParseProxy);
   parser_map["chromeOptions"] = base::Bind(&ParseDesktopChromeOption);
   for (std::map<std::string, Parser>::iterator it = parser_map.begin();
        it != parser_map.end(); ++it) {
     const base::Value* capability = NULL;
     if (desired_caps.Get(it->first, &capability)) {
       status = it->second.Run(*capability, this);
       if (status.IsError())
         return status;
     }
   }
   return Status(kOk);
 }