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

Side by Side Diff: chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc

Issue 660873002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
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 "chrome/browser/safe_browsing/incident_reporting/preference_validation_ delegate.h" 5 #include "chrome/browser/safe_browsing/incident_reporting/preference_validation_ delegate.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 case Value::TYPE_INTEGER: 119 case Value::TYPE_INTEGER:
120 return scoped_ptr<Value>(new base::FundamentalValue(47)); 120 return scoped_ptr<Value>(new base::FundamentalValue(47));
121 case Value::TYPE_DOUBLE: 121 case Value::TYPE_DOUBLE:
122 return scoped_ptr<Value>(new base::FundamentalValue(0.47)); 122 return scoped_ptr<Value>(new base::FundamentalValue(0.47));
123 case Value::TYPE_STRING: 123 case Value::TYPE_STRING:
124 return scoped_ptr<Value>(new base::StringValue("i have a spleen")); 124 return scoped_ptr<Value>(new base::StringValue("i have a spleen"));
125 case Value::TYPE_DICTIONARY: { 125 case Value::TYPE_DICTIONARY: {
126 scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue()); 126 scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
127 value->SetInteger("twenty-two", 22); 127 value->SetInteger("twenty-two", 22);
128 value->SetInteger("forty-seven", 47); 128 value->SetInteger("forty-seven", 47);
129 return value.PassAs<Value>(); 129 return value.Pass();
130 } 130 }
131 case Value::TYPE_LIST: { 131 case Value::TYPE_LIST: {
132 scoped_ptr<base::ListValue> value(new base::ListValue()); 132 scoped_ptr<base::ListValue> value(new base::ListValue());
133 value->AppendInteger(22); 133 value->AppendInteger(22);
134 value->AppendInteger(47); 134 value->AppendInteger(47);
135 return value.PassAs<Value>(); 135 return value.Pass();
136 } 136 }
137 default: 137 default:
138 ADD_FAILURE() << "unsupported value type " << value_type; 138 ADD_FAILURE() << "unsupported value type " << value_type;
139 } 139 }
140 return scoped_ptr<Value>(); 140 return scoped_ptr<Value>();
141 } 141 }
142 142
143 base::Value::Type value_type_; 143 base::Value::Type value_type_;
144 const char* expected_value_; 144 const char* expected_value_;
145 }; 145 };
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 270
271 INSTANTIATE_TEST_CASE_P( 271 INSTANTIATE_TEST_CASE_P(
272 WithIncident, 272 WithIncident,
273 PreferenceValidationDelegateWithIncident, 273 PreferenceValidationDelegateWithIncident,
274 testing::Combine( 274 testing::Combine(
275 testing::Values(PrefHashStoreTransaction::CLEARED, 275 testing::Values(PrefHashStoreTransaction::CLEARED,
276 PrefHashStoreTransaction::CHANGED, 276 PrefHashStoreTransaction::CHANGED,
277 PrefHashStoreTransaction::UNTRUSTED_UNKNOWN_VALUE), 277 PrefHashStoreTransaction::UNTRUSTED_UNKNOWN_VALUE),
278 testing::Values(TrackedPreferenceHelper::WANTED_RESET, 278 testing::Values(TrackedPreferenceHelper::WANTED_RESET,
279 TrackedPreferenceHelper::DO_RESET))); 279 TrackedPreferenceHelper::DO_RESET)));
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698