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"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/test/chromedriver/chrome/status.h"
+#include "chrome/test/chromedriver/logging.h"

[kkania, 2013/04/18 20:27:55]

you can drop this now

[klm, 2013/04/18 22:53:34]

Done.

 
 namespace {
 
 typedef base::Callback<Status(const base::Value&, Capabilities*)> Parser;
 
 Status ParseChromeBinary(
     const base::Value& option,
     Capabilities* capabilities) {
   base::FilePath::StringType path_str;
   if (!option.GetAsString(&path_str))
@@ skipping 169 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::Value& option,
+                         Capabilities* capabilities) {
+  const base::DictionaryValue* logging_prefs;
+  if (!option.GetAsDictionary(&logging_prefs))
+    return Status(kUnknownError, "'loggingPrefs' must be a dictionary");
+  // TODO(klm): verify log types.
+  // TODO(klm): verify log levels.
+  capabilities->logging_prefs.reset(logging_prefs->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);
   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);
+  parser_map["loggingPrefs"] = base::Bind(&ParseLoggingPrefs);

[klm, 2013/04/18 22:53:34]

Notice how I changed the way I parse logging prefs -- we don't get this far when
IsAndroid()!

   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);
 }