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

Side by Side Diff: chrome/test/chromedriver/performance_logger.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: Forgot to git add new files 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/performance_logger.h" 5 #include "chrome/test/chromedriver/performance_logger.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/json/json_writer.h" 11 #include "base/json/json_writer.h"
12 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "chrome/test/chromedriver/chrome/browser_info.h"
14 #include "chrome/test/chromedriver/chrome/chrome.h" 15 #include "chrome/test/chromedriver/chrome/chrome.h"
15 #include "chrome/test/chromedriver/chrome/devtools_client.h" 16 #include "chrome/test/chromedriver/chrome/devtools_client.h"
16 #include "chrome/test/chromedriver/chrome/devtools_client_impl.h" 17 #include "chrome/test/chromedriver/chrome/devtools_client_impl.h"
17 #include "chrome/test/chromedriver/chrome/log.h" 18 #include "chrome/test/chromedriver/chrome/log.h"
18 #include "chrome/test/chromedriver/chrome/status.h" 19 #include "chrome/test/chromedriver/chrome/status.h"
19 #include "chrome/test/chromedriver/chrome/version.h" 20 #include "chrome/test/chromedriver/chrome/version.h"
20 #include "chrome/test/chromedriver/session.h" 21 #include "chrome/test/chromedriver/session.h"
21 22
22 namespace { 23 namespace {
23 24
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 if (status.IsError()) 288 if (status.IsError())
288 return status; 289 return status;
289 290
290 return StartTrace(); 291 return StartTrace();
291 } 292 }
292 293
293 Status PerformanceLogger::IsTraceDone(bool* trace_done) const { 294 Status PerformanceLogger::IsTraceDone(bool* trace_done) const {
294 *trace_done = !trace_buffering_; 295 *trace_done = !trace_buffering_;
295 return Status(kOk); 296 return Status(kOk);
296 } 297 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698