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

Unified Diff: base/test/gtest_util.cc

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fixed bad android build patch Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/test/data/prefs/write.golden.json ('k') | base/test/mock_log.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/gtest_util.cc
diff --git a/base/test/gtest_util.cc b/base/test/gtest_util.cc
index c0bc04a629a842ecb29b7ddebe4bfdb8091101dd..b81119474f6a02c464954256c644d4d97e2000d2 100644
--- a/base/test/gtest_util.cc
+++ b/base/test/gtest_util.cc
@@ -47,7 +47,7 @@ bool WriteCompiledInTestsToFile(const FilePath& path) {
bool ReadTestNamesFromFile(const FilePath& path,
std::vector<SplitTestName>* output) {
- JSONFileValueSerializer deserializer(path);
+ JSONFileValueDeserializer deserializer(path);
int error_code = 0;
std::string error_message;
scoped_ptr<base::Value> value(
@@ -80,4 +80,4 @@ bool ReadTestNamesFromFile(const FilePath& path,
return true;
}
-} // namespace
+} // namespace base
« no previous file with comments | « base/test/data/prefs/write.golden.json ('k') | base/test/mock_log.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698