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

Side by Side Diff: chrome/browser/extensions/api/browsing_data/browsing_data_test.cc

Issue 16295003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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 | Annotate | Revision Log
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 <string> 5 #include <string>
6 6
7 #include "base/json/json_string_value_serializer.h" 7 #include "base/json/json_string_value_serializer.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 // is called. 238 // is called.
239 void CheckRemovalPermitted(const std::string& data_types, bool permitted) { 239 void CheckRemovalPermitted(const std::string& data_types, bool permitted) {
240 scoped_refptr<RemoveBrowsingDataFunction> function = 240 scoped_refptr<RemoveBrowsingDataFunction> function =
241 new RemoveBrowsingDataFunction(); 241 new RemoveBrowsingDataFunction();
242 std::string args = "[{\"since\": 1}," + data_types + "]"; 242 std::string args = "[{\"since\": 1}," + data_types + "]";
243 243
244 if (permitted) { 244 if (permitted) {
245 EXPECT_EQ(NULL, RunFunctionAndReturnSingleResult( 245 EXPECT_EQ(NULL, RunFunctionAndReturnSingleResult(
246 function.get(), args, browser())) << " for " << args; 246 function.get(), args, browser())) << " for " << args;
247 } else { 247 } else {
248 EXPECT_TRUE( 248 EXPECT_TRUE(MatchPattern(
249 MatchPattern(RunFunctionAndReturnError(function, args, browser()), 249 RunFunctionAndReturnError(function.get(), args, browser()),
250 extension_browsing_data_api_constants::kDeleteProhibitedError)) << 250 extension_browsing_data_api_constants::kDeleteProhibitedError))
251 " for " << args; 251 << " for " << args;
252 } 252 }
253 } 253 }
254 254
255 private: 255 private:
256 scoped_ptr<BrowsingDataRemover::NotificationDetails> called_with_details_; 256 scoped_ptr<BrowsingDataRemover::NotificationDetails> called_with_details_;
257 content::NotificationRegistrar registrar_; 257 content::NotificationRegistrar registrar_;
258 }; 258 };
259 259
260 } // namespace 260 } // namespace
261 261
262 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, OneAtATime) { 262 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, OneAtATime) {
263 BrowsingDataRemover::set_removing(true); 263 BrowsingDataRemover::set_removing(true);
264 scoped_refptr<RemoveBrowsingDataFunction> function = 264 scoped_refptr<RemoveBrowsingDataFunction> function =
265 new RemoveBrowsingDataFunction(); 265 new RemoveBrowsingDataFunction();
266 EXPECT_TRUE(MatchPattern( 266 EXPECT_TRUE(
267 RunFunctionAndReturnError(function, 267 MatchPattern(RunFunctionAndReturnError(
268 kRemoveEverythingArguments, 268 function.get(), kRemoveEverythingArguments, browser()),
269 browser()), 269 extension_browsing_data_api_constants::kOneAtATimeError));
270 extension_browsing_data_api_constants::kOneAtATimeError));
271 BrowsingDataRemover::set_removing(false); 270 BrowsingDataRemover::set_removing(false);
272 271
273 EXPECT_EQ(base::Time(), GetBeginTime()); 272 EXPECT_EQ(base::Time(), GetBeginTime());
274 EXPECT_EQ(-1, GetRemovalMask()); 273 EXPECT_EQ(-1, GetRemovalMask());
275 } 274 }
276 275
277 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, RemovalProhibited) { 276 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, RemovalProhibited) {
278 PrefService* prefs = browser()->profile()->GetPrefs(); 277 PrefService* prefs = browser()->profile()->GetPrefs();
279 prefs->SetBoolean(prefs::kAllowDeletingBrowserHistory, false); 278 prefs->SetBoolean(prefs::kAllowDeletingBrowserHistory, false);
280 279
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 516
518 SetPrefsAndVerifySettings( 517 SetPrefsAndVerifySettings(
519 BrowsingDataRemover::REMOVE_COOKIES | 518 BrowsingDataRemover::REMOVE_COOKIES |
520 BrowsingDataRemover::REMOVE_HISTORY | 519 BrowsingDataRemover::REMOVE_HISTORY |
521 BrowsingDataRemover::REMOVE_DOWNLOADS, 520 BrowsingDataRemover::REMOVE_DOWNLOADS,
522 UNPROTECTED_WEB, 521 UNPROTECTED_WEB,
523 site_data_no_plugins | 522 site_data_no_plugins |
524 BrowsingDataRemover::REMOVE_HISTORY | 523 BrowsingDataRemover::REMOVE_HISTORY |
525 BrowsingDataRemover::REMOVE_DOWNLOADS); 524 BrowsingDataRemover::REMOVE_DOWNLOADS);
526 } 525 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698