summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortzik <tzik@chromium.org>2016-01-12 12:03:05 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-12 20:04:21 +0000
commit58b552f655dfd697efdcd561bdcd5df866f5a7d1 (patch)
tree14dfbff0c187bfb4120022593cf91a042e091d24
parentf36b8e8274a5f07914c27a1abefb38f4c9a6ec24 (diff)
downloadchromium_src-58b552f655dfd697efdcd561bdcd5df866f5a7d1.zip
chromium_src-58b552f655dfd697efdcd561bdcd5df866f5a7d1.tar.gz
chromium_src-58b552f655dfd697efdcd561bdcd5df866f5a7d1.tar.bz2
Update an error message expectation on base_nocompile_test
TEST=gn gen out/Release --args=enable_nocompile_tests && ninja -C out/Release base_nocompile_tests Review URL: https://codereview.chromium.org/1556043008 Cr-Commit-Position: refs/heads/master@{#368962}
-rw-r--r--base/memory/scoped_ptr_unittest.nc2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/memory/scoped_ptr_unittest.nc b/base/memory/scoped_ptr_unittest.nc
index 329c976..10b45a1 100644
--- a/base/memory/scoped_ptr_unittest.nc
+++ b/base/memory/scoped_ptr_unittest.nc
@@ -25,7 +25,7 @@ class RefCountedClass : public base::RefCountedThreadSafe<RefCountedClass> {
} // namespace
-#if defined(NCTEST_NO_PASS_DOWNCAST) // [r"fatal error: no viable conversion from returned value of type 'scoped_ptr<\(anonymous namespace\)::Parent, default_delete<\(anonymous namespace\)::Parent>>' to function return type 'scoped_ptr<\(anonymous namespace\)::Child, default_delete<\(anonymous namespace\)::Child>>'"]
+#if defined(NCTEST_NO_PASS_DOWNCAST) // [r"fatal error: no viable conversion from returned value of type 'scoped_ptr<\(anonymous namespace\)::Parent>' to function return type 'scoped_ptr<\(anonymous namespace\)::Child>'"]
scoped_ptr<Child> DowncastUsingPassAs(scoped_ptr<Parent> object) {
return object;