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

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

Issue 1551503002: Convert Pass()→std::move() in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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/supervised_user/supervised_user_service.h"
6
5 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility>
6 9
7 #include "base/macros.h" 10 #include "base/macros.h"
8 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
9 #include "base/path_service.h" 12 #include "base/path_service.h"
10 #include "base/prefs/pref_service.h" 13 #include "base/prefs/pref_service.h"
11 #include "base/prefs/scoped_user_pref_update.h" 14 #include "base/prefs/scoped_user_pref_update.h"
12 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
13 #include "base/thread_task_runner_handle.h" 16 #include "base/thread_task_runner_handle.h"
14 #include "build/build_config.h" 17 #include "build/build_config.h"
15 #include "chrome/browser/chrome_notification_types.h" 18 #include "chrome/browser/chrome_notification_types.h"
16 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" 20 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
18 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 21 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
19 #include "chrome/browser/signin/signin_manager_factory.h" 22 #include "chrome/browser/signin/signin_manager_factory.h"
20 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice.h" 23 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice.h"
21 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice_factory.h" 24 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice_factory.h"
22 #include "chrome/browser/supervised_user/permission_request_creator.h" 25 #include "chrome/browser/supervised_user/permission_request_creator.h"
23 #include "chrome/browser/supervised_user/supervised_user_service.h"
24 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" 26 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
25 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" 27 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h"
26 #include "chrome/browser/ui/browser_list.h" 28 #include "chrome/browser/ui/browser_list.h"
27 #include "chrome/common/chrome_paths.h" 29 #include "chrome/common/chrome_paths.h"
28 #include "chrome/common/pref_names.h" 30 #include "chrome/common/pref_names.h"
29 #include "chrome/test/base/testing_profile.h" 31 #include "chrome/test/base/testing_profile.h"
30 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" 32 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
31 #include "components/signin/core/browser/signin_manager.h" 33 #include "components/signin/core/browser/signin_manager.h"
32 #include "components/version_info/version_info.h" 34 #include "components/version_info/version_info.h"
33 #include "content/public/test/test_browser_thread_bundle.h" 35 #include "content/public/test/test_browser_thread_bundle.h"
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 } 388 }
387 389
388 protected: 390 protected:
389 scoped_refptr<extensions::Extension> MakeThemeExtension() { 391 scoped_refptr<extensions::Extension> MakeThemeExtension() {
390 scoped_ptr<base::DictionaryValue> source(new base::DictionaryValue()); 392 scoped_ptr<base::DictionaryValue> source(new base::DictionaryValue());
391 source->SetString(extensions::manifest_keys::kName, "Theme"); 393 source->SetString(extensions::manifest_keys::kName, "Theme");
392 source->Set(extensions::manifest_keys::kTheme, new base::DictionaryValue()); 394 source->Set(extensions::manifest_keys::kTheme, new base::DictionaryValue());
393 source->SetString(extensions::manifest_keys::kVersion, "1.0"); 395 source->SetString(extensions::manifest_keys::kVersion, "1.0");
394 extensions::ExtensionBuilder builder; 396 extensions::ExtensionBuilder builder;
395 scoped_refptr<extensions::Extension> extension = 397 scoped_refptr<extensions::Extension> extension =
396 builder.SetManifest(source.Pass()).Build(); 398 builder.SetManifest(std::move(source)).Build();
397 return extension; 399 return extension;
398 } 400 }
399 401
400 scoped_refptr<extensions::Extension> MakeExtension(bool by_custodian) { 402 scoped_refptr<extensions::Extension> MakeExtension(bool by_custodian) {
401 scoped_ptr<base::DictionaryValue> manifest = extensions::DictionaryBuilder() 403 scoped_ptr<base::DictionaryValue> manifest = extensions::DictionaryBuilder()
402 .Set(extensions::manifest_keys::kName, "Extension") 404 .Set(extensions::manifest_keys::kName, "Extension")
403 .Set(extensions::manifest_keys::kVersion, "1.0") 405 .Set(extensions::manifest_keys::kVersion, "1.0")
404 .Build(); 406 .Build();
405 int creation_flags = extensions::Extension::NO_FLAGS; 407 int creation_flags = extensions::Extension::NO_FLAGS;
406 if (by_custodian) 408 if (by_custodian)
407 creation_flags |= extensions::Extension::WAS_INSTALLED_BY_CUSTODIAN; 409 creation_flags |= extensions::Extension::WAS_INSTALLED_BY_CUSTODIAN;
408 extensions::ExtensionBuilder builder; 410 extensions::ExtensionBuilder builder;
409 scoped_refptr<extensions::Extension> extension = 411 scoped_refptr<extensions::Extension> extension =
410 builder.SetManifest(manifest.Pass()).AddFlags(creation_flags).Build(); 412 builder.SetManifest(std::move(manifest))
413 .AddFlags(creation_flags)
414 .Build();
411 return extension; 415 return extension;
412 } 416 }
413 417
414 bool is_supervised_; 418 bool is_supervised_;
415 extensions::ScopedCurrentChannel channel_; 419 extensions::ScopedCurrentChannel channel_;
416 SiteListObserver site_list_observer_; 420 SiteListObserver site_list_observer_;
417 SupervisedUserURLFilterObserver url_filter_observer_; 421 SupervisedUserURLFilterObserver url_filter_observer_;
418 }; 422 };
419 423
420 class SupervisedUserServiceExtensionTestUnsupervised 424 class SupervisedUserServiceExtensionTestUnsupervised
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 EXPECT_EQ(title2, site_list_observer_.site_lists()[0]->title()); 573 EXPECT_EQ(title2, site_list_observer_.site_lists()[0]->title());
570 EXPECT_TRUE(site_list_observer_.site_lists()[0]->entry_point().is_empty()); 574 EXPECT_TRUE(site_list_observer_.site_lists()[0]->entry_point().is_empty());
571 575
572 url_filter_observer_.Wait(); 576 url_filter_observer_.Wait();
573 EXPECT_EQ(SupervisedUserURLFilter::WARN, 577 EXPECT_EQ(SupervisedUserURLFilter::WARN,
574 url_filter->GetFilteringBehaviorForURL(youtube_url)); 578 url_filter->GetFilteringBehaviorForURL(youtube_url));
575 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, 579 EXPECT_EQ(SupervisedUserURLFilter::ALLOW,
576 url_filter->GetFilteringBehaviorForURL(moose_url)); 580 url_filter->GetFilteringBehaviorForURL(moose_url));
577 } 581 }
578 #endif // defined(ENABLE_EXTENSIONS) 582 #endif // defined(ENABLE_EXTENSIONS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698