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

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

Issue 2911033002: Remove raw base::DictionaryValue::Set (Closed)
Patch Set: Proper Windows Fix Created 3 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
« no previous file with comments | « base/values.cc ('k') | chrome/browser/sync_file_system/drive_backend/metadata_database.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/supervised_user/supervised_user_service.h" 5 #include "chrome/browser/supervised_user/supervised_user_service.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/ptr_util.h" 13 #include "base/memory/ptr_util.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "base/test/scoped_feature_list.h" 16 #include "base/test/scoped_feature_list.h"
17 #include "base/threading/thread_task_runner_handle.h" 17 #include "base/threading/thread_task_runner_handle.h"
18 #include "base/values.h"
18 #include "build/build_config.h" 19 #include "build/build_config.h"
19 #include "chrome/browser/chrome_notification_types.h" 20 #include "chrome/browser/chrome_notification_types.h"
20 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" 22 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
22 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 23 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
23 #include "chrome/browser/signin/signin_manager_factory.h" 24 #include "chrome/browser/signin/signin_manager_factory.h"
24 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice.h" 25 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice.h"
25 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice_factory.h" 26 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice_factory.h"
26 #include "chrome/browser/supervised_user/permission_request_creator.h" 27 #include "chrome/browser/supervised_user/permission_request_creator.h"
27 #include "chrome/browser/supervised_user/supervised_user_features.h" 28 #include "chrome/browser/supervised_user/supervised_user_features.h"
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 398
398 void TearDown() override { 399 void TearDown() override {
399 // Flush the message loop, to ensure all posted tasks run. 400 // Flush the message loop, to ensure all posted tasks run.
400 base::RunLoop().RunUntilIdle(); 401 base::RunLoop().RunUntilIdle();
401 } 402 }
402 403
403 protected: 404 protected:
404 scoped_refptr<extensions::Extension> MakeThemeExtension() { 405 scoped_refptr<extensions::Extension> MakeThemeExtension() {
405 std::unique_ptr<base::DictionaryValue> source(new base::DictionaryValue()); 406 std::unique_ptr<base::DictionaryValue> source(new base::DictionaryValue());
406 source->SetString(extensions::manifest_keys::kName, "Theme"); 407 source->SetString(extensions::manifest_keys::kName, "Theme");
407 source->Set(extensions::manifest_keys::kTheme, new base::DictionaryValue()); 408 source->Set(extensions::manifest_keys::kTheme,
409 base::MakeUnique<base::DictionaryValue>());
408 source->SetString(extensions::manifest_keys::kVersion, "1.0"); 410 source->SetString(extensions::manifest_keys::kVersion, "1.0");
409 extensions::ExtensionBuilder builder; 411 extensions::ExtensionBuilder builder;
410 scoped_refptr<extensions::Extension> extension = 412 scoped_refptr<extensions::Extension> extension =
411 builder.SetManifest(std::move(source)).Build(); 413 builder.SetManifest(std::move(source)).Build();
412 return extension; 414 return extension;
413 } 415 }
414 416
415 scoped_refptr<extensions::Extension> MakeExtension(bool by_custodian) { 417 scoped_refptr<extensions::Extension> MakeExtension(bool by_custodian) {
416 std::unique_ptr<base::DictionaryValue> manifest = 418 std::unique_ptr<base::DictionaryValue> manifest =
417 extensions::DictionaryBuilder() 419 extensions::DictionaryBuilder()
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 EXPECT_EQ(title2, site_list_observer_.site_lists()[0]->title()); 677 EXPECT_EQ(title2, site_list_observer_.site_lists()[0]->title());
676 EXPECT_TRUE(site_list_observer_.site_lists()[0]->entry_point().is_empty()); 678 EXPECT_TRUE(site_list_observer_.site_lists()[0]->entry_point().is_empty());
677 679
678 url_filter_observer_.Wait(); 680 url_filter_observer_.Wait();
679 EXPECT_EQ(SupervisedUserURLFilter::WARN, 681 EXPECT_EQ(SupervisedUserURLFilter::WARN,
680 url_filter->GetFilteringBehaviorForURL(youtube_url)); 682 url_filter->GetFilteringBehaviorForURL(youtube_url));
681 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, 683 EXPECT_EQ(SupervisedUserURLFilter::ALLOW,
682 url_filter->GetFilteringBehaviorForURL(moose_url)); 684 url_filter->GetFilteringBehaviorForURL(moose_url));
683 } 685 }
684 #endif // BUILDFLAG(ENABLE_EXTENSIONS) 686 #endif // BUILDFLAG(ENABLE_EXTENSIONS)
OLDNEW
« no previous file with comments | « base/values.cc ('k') | chrome/browser/sync_file_system/drive_backend/metadata_database.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698