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

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

Issue 605143002: [chromedriver] Accept git hashes in blink version strings from devtools (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix review nits Created 6 years, 2 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
« no previous file with comments | « chrome/test/chromedriver/session_commands.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/util.h" 5 #include "chrome/test/chromedriver/util.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/files/file_enumerator.h" 8 #include "base/files/file_enumerator.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
11 #include "base/format_macros.h" 11 #include "base/format_macros.h"
12 #include "base/memory/scoped_vector.h" 12 #include "base/memory/scoped_vector.h"
13 #include "base/rand_util.h" 13 #include "base/rand_util.h"
14 #include "base/strings/string16.h" 14 #include "base/strings/string16.h"
15 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
17 #include "base/third_party/icu/icu_utf.h" 17 #include "base/third_party/icu/icu_utf.h"
18 #include "base/values.h" 18 #include "base/values.h"
19 #include "chrome/test/chromedriver/chrome/browser_info.h"
19 #include "chrome/test/chromedriver/chrome/chrome.h" 20 #include "chrome/test/chromedriver/chrome/chrome.h"
20 #include "chrome/test/chromedriver/chrome/status.h" 21 #include "chrome/test/chromedriver/chrome/status.h"
21 #include "chrome/test/chromedriver/chrome/ui_events.h" 22 #include "chrome/test/chromedriver/chrome/ui_events.h"
22 #include "chrome/test/chromedriver/chrome/version.h"
23 #include "chrome/test/chromedriver/chrome/web_view.h" 23 #include "chrome/test/chromedriver/chrome/web_view.h"
24 #include "chrome/test/chromedriver/command_listener.h" 24 #include "chrome/test/chromedriver/command_listener.h"
25 #include "chrome/test/chromedriver/key_converter.h" 25 #include "chrome/test/chromedriver/key_converter.h"
26 #include "chrome/test/chromedriver/session.h" 26 #include "chrome/test/chromedriver/session.h"
27 #include "third_party/zlib/google/zip.h" 27 #include "third_party/zlib/google/zip.h"
28 28
29 std::string GenerateId() { 29 std::string GenerateId() {
30 uint64 msb = base::RandUint64(); 30 uint64 msb = base::RandUint64();
31 uint64 lsb = base::RandUint64(); 31 uint64 lsb = base::RandUint64();
32 return base::StringPrintf("%016" PRIx64 "%016" PRIx64, msb, lsb); 32 return base::StringPrintf("%016" PRIx64 "%016" PRIx64, msb, lsb);
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 if (session->chrome) { 432 if (session->chrome) {
433 const BrowserInfo* browser_info = session->chrome->GetBrowserInfo(); 433 const BrowserInfo* browser_info = session->chrome->GetBrowserInfo();
434 status.AddDetails("Session info: " + browser_info->browser_name + "=" + 434 status.AddDetails("Session info: " + browser_info->browser_name + "=" +
435 browser_info->browser_version); 435 browser_info->browser_version);
436 } 436 }
437 return status; 437 return status;
438 } 438 }
439 } 439 }
440 return Status(kOk); 440 return Status(kOk);
441 } 441 }
OLDNEW
« no previous file with comments | « chrome/test/chromedriver/session_commands.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698