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

Side by Side Diff: base/android/path_utils_unittest.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 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/android/path_utils.h" 5 #include "base/android/path_utils.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 9
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/googletest/include/gtest/gtest.h"
11 11
12 namespace base { 12 namespace base {
13 namespace android { 13 namespace android {
14 14
15 typedef testing::Test PathUtilsTest; 15 typedef testing::Test PathUtilsTest;
16 16
17 namespace { 17 namespace {
18 void ExpectEither(const std::string& expected1, 18 void ExpectEither(const std::string& expected1,
19 const std::string& expected2, 19 const std::string& expected2,
20 const std::string& actual) { 20 const std::string& actual) {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 GetNativeLibraryDirectory(&path); 56 GetNativeLibraryDirectory(&path);
57 EXPECT_TRUE( 57 EXPECT_TRUE(
58 base::PathExists(path.Append("libbase_unittests.so")) || 58 base::PathExists(path.Append("libbase_unittests.so")) ||
59 base::PathExists(path.Append("libbase_unittests.cr.so")) || 59 base::PathExists(path.Append("libbase_unittests.cr.so")) ||
60 base::PathExists(path.Append("lib_base_unittests__library.so")) || 60 base::PathExists(path.Append("lib_base_unittests__library.so")) ||
61 base::PathExists(path.Append("lib_base_unittests__library.cr.so"))); 61 base::PathExists(path.Append("lib_base_unittests__library.cr.so")));
62 } 62 }
63 63
64 } // namespace android 64 } // namespace android
65 } // namespace base 65 } // namespace base
OLDNEW
« no previous file with comments | « base/android/library_loader/library_prefetcher_unittest.cc ('k') | base/android/scoped_java_ref_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698