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

Side by Side Diff: chrome/browser/supervised_user/supervised_user_browsertest.cc

Issue 2666093002: Remove base::FundamentalValue (Closed)
Patch Set: Rebase Created 3 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 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 <utility> 5 #include <utility>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 class SupervisedUserBlockModeTest : public SupervisedUserTest { 155 class SupervisedUserBlockModeTest : public SupervisedUserTest {
156 public: 156 public:
157 void SetUpOnMainThread() override { 157 void SetUpOnMainThread() override {
158 SupervisedUserTest::SetUpOnMainThread(); 158 SupervisedUserTest::SetUpOnMainThread();
159 159
160 Profile* profile = browser()->profile(); 160 Profile* profile = browser()->profile();
161 SupervisedUserSettingsService* supervised_user_settings_service = 161 SupervisedUserSettingsService* supervised_user_settings_service =
162 SupervisedUserSettingsServiceFactory::GetForProfile(profile); 162 SupervisedUserSettingsServiceFactory::GetForProfile(profile);
163 supervised_user_settings_service->SetLocalSetting( 163 supervised_user_settings_service->SetLocalSetting(
164 supervised_users::kContentPackDefaultFilteringBehavior, 164 supervised_users::kContentPackDefaultFilteringBehavior,
165 base::MakeUnique<base::FundamentalValue>( 165 base::MakeUnique<base::Value>(SupervisedUserURLFilter::BLOCK));
166 SupervisedUserURLFilter::BLOCK));
167 } 166 }
168 }; 167 };
169 168
170 class MockTabStripModelObserver : public TabStripModelObserver { 169 class MockTabStripModelObserver : public TabStripModelObserver {
171 public: 170 public:
172 explicit MockTabStripModelObserver(TabStripModel* tab_strip) 171 explicit MockTabStripModelObserver(TabStripModel* tab_strip)
173 : tab_strip_(tab_strip) { 172 : tab_strip_(tab_strip) {
174 tab_strip_->AddObserver(this); 173 tab_strip_->AddObserver(this);
175 } 174 }
176 175
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 scoped_refptr<SupervisedUserURLFilter> filter = 429 scoped_refptr<SupervisedUserURLFilter> filter =
431 supervised_user_service_->GetURLFilterForUIThread(); 430 supervised_user_service_->GetURLFilterForUIThread();
432 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, 431 EXPECT_EQ(SupervisedUserURLFilter::ALLOW,
433 filter->GetFilteringBehaviorForURL(test_url.GetWithEmptyPath())); 432 filter->GetFilteringBehaviorForURL(test_url.GetWithEmptyPath()));
434 433
435 observer.Wait(); 434 observer.Wait();
436 EXPECT_EQ(test_url, web_contents->GetURL()); 435 EXPECT_EQ(test_url, web_contents->GetURL());
437 } 436 }
438 437
439 } // namespace 438 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698