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

Side by Side Diff: mojo/edk/test/test_support_impl.cc

Issue 728133002: Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android + ios gyp fixes Created 6 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 | « mojo/edk/test/run_all_unittests.cc ('k') | mojo/edk/test/test_utils_win.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 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 "mojo/edk/test/test_support_impl.h" 5 #include "mojo/edk/test/test_support_impl.h"
6 6
7 #include <stdlib.h> 7 #include <stdlib.h>
8 #include <string.h> 8 #include <string.h>
9 9
10 #include "base/files/file_enumerator.h" 10 #include "base/files/file_enumerator.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 base::LogPerfResult(test_name, value, units); 49 base::LogPerfResult(test_name, value, units);
50 } 50 }
51 51
52 FILE* TestSupportImpl::OpenSourceRootRelativeFile(const char* relative_path) { 52 FILE* TestSupportImpl::OpenSourceRootRelativeFile(const char* relative_path) {
53 return base::OpenFile(ResolveSourceRootRelativePath(relative_path), "rb"); 53 return base::OpenFile(ResolveSourceRootRelativePath(relative_path), "rb");
54 } 54 }
55 55
56 char** TestSupportImpl::EnumerateSourceRootRelativeDirectory( 56 char** TestSupportImpl::EnumerateSourceRootRelativeDirectory(
57 const char* relative_path) { 57 const char* relative_path) {
58 std::vector<std::string> names; 58 std::vector<std::string> names;
59 base::FileEnumerator e(ResolveSourceRootRelativePath(relative_path), 59 base::FileEnumerator e(ResolveSourceRootRelativePath(relative_path), false,
60 false,
61 base::FileEnumerator::FILES); 60 base::FileEnumerator::FILES);
62 for (base::FilePath name = e.Next(); !name.empty(); name = e.Next()) 61 for (base::FilePath name = e.Next(); !name.empty(); name = e.Next())
63 names.push_back(name.BaseName().AsUTF8Unsafe()); 62 names.push_back(name.BaseName().AsUTF8Unsafe());
64 63
65 // |names.size() + 1| for null terminator. 64 // |names.size() + 1| for null terminator.
66 char** rv = static_cast<char**>(calloc(names.size() + 1, sizeof(char*))); 65 char** rv = static_cast<char**>(calloc(names.size() + 1, sizeof(char*)));
67 for (size_t i = 0; i < names.size(); ++i) 66 for (size_t i = 0; i < names.size(); ++i)
68 rv[i] = base::strdup(names[i].c_str()); 67 rv[i] = base::strdup(names[i].c_str());
69 return rv; 68 return rv;
70 } 69 }
71 70
72 } // namespace test 71 } // namespace test
73 } // namespace mojo 72 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/edk/test/run_all_unittests.cc ('k') | mojo/edk/test/test_utils_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698