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

Side by Side Diff: base/test/launcher/test_launcher.cc

Issue 1466413002: Update gtest to 786564fa4a3c, switch to googlemock in gtest Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « base/test/histogram_tester_unittest.cc ('k') | base/test/launcher/unit_test_launcher.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "base/test/launcher/test_launcher.h" 5 #include "base/test/launcher/test_launcher.h"
6 6
7 #if defined(OS_POSIX) 7 #if defined(OS_POSIX)
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #endif 9 #endif
10 10
(...skipping 22 matching lines...) Expand all
33 #include "base/strings/stringprintf.h" 33 #include "base/strings/stringprintf.h"
34 #include "base/strings/utf_string_conversions.h" 34 #include "base/strings/utf_string_conversions.h"
35 #include "base/test/gtest_util.h" 35 #include "base/test/gtest_util.h"
36 #include "base/test/launcher/test_results_tracker.h" 36 #include "base/test/launcher/test_results_tracker.h"
37 #include "base/test/sequenced_worker_pool_owner.h" 37 #include "base/test/sequenced_worker_pool_owner.h"
38 #include "base/test/test_switches.h" 38 #include "base/test/test_switches.h"
39 #include "base/test/test_timeouts.h" 39 #include "base/test/test_timeouts.h"
40 #include "base/thread_task_runner_handle.h" 40 #include "base/thread_task_runner_handle.h"
41 #include "base/threading/thread_checker.h" 41 #include "base/threading/thread_checker.h"
42 #include "base/time/time.h" 42 #include "base/time/time.h"
43 #include "testing/gtest/include/gtest/gtest.h" 43 #include "testing/gtest/googletest/include/gtest/gtest.h"
44 44
45 #if defined(OS_MACOSX) 45 #if defined(OS_MACOSX)
46 #include "base/mac/scoped_nsautorelease_pool.h" 46 #include "base/mac/scoped_nsautorelease_pool.h"
47 #endif 47 #endif
48 48
49 #if defined(OS_WIN) 49 #if defined(OS_WIN)
50 #include "base/win/windows_version.h" 50 #include "base/win/windows_version.h"
51 #endif 51 #endif
52 52
53 namespace base { 53 namespace base {
(...skipping 1034 matching lines...) Expand 10 before | Expand all | Expand 10 after
1088 } 1088 }
1089 1089
1090 std::string snippet(full_output.substr(run_pos)); 1090 std::string snippet(full_output.substr(run_pos));
1091 if (end_pos != std::string::npos) 1091 if (end_pos != std::string::npos)
1092 snippet = full_output.substr(run_pos, end_pos - run_pos); 1092 snippet = full_output.substr(run_pos, end_pos - run_pos);
1093 1093
1094 return snippet; 1094 return snippet;
1095 } 1095 }
1096 1096
1097 } // namespace base 1097 } // namespace base
OLDNEW
« no previous file with comments | « base/test/histogram_tester_unittest.cc ('k') | base/test/launcher/unit_test_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698