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

Unified Diff: chrome/browser/supervised_user/supervised_user_browsertest.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/supervised_user/supervised_user_browsertest.cc
diff --git a/chrome/browser/supervised_user/supervised_user_browsertest.cc b/chrome/browser/supervised_user/supervised_user_browsertest.cc
index 2194f952cb019541e8676bf73fa995f8e8537a09..3fd97544ad7faa108b054a53b8954e5163bcfb2d 100644
--- a/chrome/browser/supervised_user/supervised_user_browsertest.cc
+++ b/chrome/browser/supervised_user/supervised_user_browsertest.cc
@@ -235,8 +235,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserBlockModeTest,
SupervisedUserSettingsServiceFactory::GetForProfile(
browser()->profile());
supervised_user_settings_service->SetLocalSettingForTesting(
- supervised_users::kContentPackManualBehaviorHosts,
- dict.PassAs<base::Value>());
+ supervised_users::kContentPackManualBehaviorHosts, dict.Pass());
EXPECT_EQ(
SupervisedUserService::MANUAL_ALLOW,
supervised_user_service_->GetManualBehaviorForHost(allowed_url.host()));
@@ -302,8 +301,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserBlockModeTest, Unblock) {
SupervisedUserSettingsServiceFactory::GetForProfile(
browser()->profile());
supervised_user_settings_service->SetLocalSettingForTesting(
- supervised_users::kContentPackManualBehaviorHosts,
- dict.PassAs<base::Value>());
+ supervised_users::kContentPackManualBehaviorHosts, dict.Pass());
EXPECT_EQ(
SupervisedUserService::MANUAL_ALLOW,
supervised_user_service_->GetManualBehaviorForHost(test_url.host()));

Powered by Google App Engine
This is Rietveld 408576698