Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(98)

Side by Side Diff: chrome/test/chromedriver/capabilities.cc

Issue 1548153002: Switch to standard integer types in chrome/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/test/chromedriver/capabilities.h" 5 #include "chrome/test/chromedriver/capabilities.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/json/string_escape.h" 11 #include "base/json/string_escape.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/macros.h"
13 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
14 #include "base/strings/string_split.h" 15 #include "base/strings/string_split.h"
15 #include "base/strings/string_tokenizer.h" 16 #include "base/strings/string_tokenizer.h"
16 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
17 #include "base/strings/stringprintf.h" 18 #include "base/strings/stringprintf.h"
18 #include "base/strings/utf_string_conversions.h" 19 #include "base/strings/utf_string_conversions.h"
19 #include "base/values.h" 20 #include "base/values.h"
21 #include "build/build_config.h"
20 #include "chrome/test/chromedriver/chrome/mobile_device.h" 22 #include "chrome/test/chromedriver/chrome/mobile_device.h"
21 #include "chrome/test/chromedriver/chrome/status.h" 23 #include "chrome/test/chromedriver/chrome/status.h"
22 #include "chrome/test/chromedriver/logging.h" 24 #include "chrome/test/chromedriver/logging.h"
23 #include "net/base/net_util.h" 25 #include "net/base/net_util.h"
24 26
25 namespace { 27 namespace {
26 28
27 typedef base::Callback<Status(const base::Value&, Capabilities*)> Parser; 29 typedef base::Callback<Status(const base::Value&, Capabilities*)> Parser;
28 30
29 Status ParseBoolean( 31 Status ParseBoolean(
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 if (iter == logging_prefs.end() || iter->second == Log::kOff) { 619 if (iter == logging_prefs.end() || iter->second == Log::kOff) {
618 const base::DictionaryValue* chrome_options = NULL; 620 const base::DictionaryValue* chrome_options = NULL;
619 if (desired_caps.GetDictionary("chromeOptions", &chrome_options) && 621 if (desired_caps.GetDictionary("chromeOptions", &chrome_options) &&
620 chrome_options->HasKey("perfLoggingPrefs")) { 622 chrome_options->HasKey("perfLoggingPrefs")) {
621 return Status(kUnknownError, "perfLoggingPrefs specified, " 623 return Status(kUnknownError, "perfLoggingPrefs specified, "
622 "but performance logging was not enabled"); 624 "but performance logging was not enabled");
623 } 625 }
624 } 626 }
625 return Status(kOk); 627 return Status(kOk);
626 } 628 }
OLDNEW
« no previous file with comments | « chrome/test/chromedriver/capabilities.h ('k') | chrome/test/chromedriver/chrome/automation_extension.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698