chrome/browser/supervised_user/supervised_user_service_unittest.cc - Issue 1269773002: Cleanup VersionInfo after componentization.

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

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years, 4 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 | « chrome/browser/signin/easy_unlock_service.cc ('k') | chrome/browser/sxs_linux.cc » ('j') | no next file with comments »

OLD	NEW
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 "base/memory/scoped_ptr.h"	5 #include "base/memory/scoped_ptr.h"

6 #include "base/path_service.h"	6 #include "base/path_service.h"

7 #include "base/prefs/pref_service.h"	7 #include "base/prefs/pref_service.h"

8 #include "base/prefs/scoped_user_pref_update.h"	8 #include "base/prefs/scoped_user_pref_update.h"

9 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

10 #include "base/thread_task_runner_handle.h"	10 #include "base/thread_task_runner_handle.h"

11 #include "chrome/browser/chrome_notification_types.h"	11 #include "chrome/browser/chrome_notification_types.h"

12 #include "chrome/browser/profiles/profile.h"	12 #include "chrome/browser/profiles/profile.h"

13 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"	13 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"

14 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"	14 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

15 #include "chrome/browser/signin/signin_manager_factory.h"	15 #include "chrome/browser/signin/signin_manager_factory.h"

16 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice.h"	16 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice.h"

17 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice_factory.h"	17 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice_factory.h"

18 #include "chrome/browser/supervised_user/permission_request_creator.h"	18 #include "chrome/browser/supervised_user/permission_request_creator.h"

19 #include "chrome/browser/supervised_user/supervised_user_service.h"	19 #include "chrome/browser/supervised_user/supervised_user_service.h"

20 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"	20 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"

21 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h"	21 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h"

22 #include "chrome/browser/ui/browser_list.h"	22 #include "chrome/browser/ui/browser_list.h"

23 #include "chrome/common/chrome_paths.h"	23 #include "chrome/common/chrome_paths.h"

24 #include "chrome/common/pref_names.h"	24 #include "chrome/common/pref_names.h"

25 #include "chrome/test/base/testing_profile.h"	25 #include "chrome/test/base/testing_profile.h"

26 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"	26 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"

27 #include "components/signin/core/browser/signin_manager.h"	27 #include "components/signin/core/browser/signin_manager.h"

	28 #include "components/version_info/version_info.h"

28 #include "content/public/test/test_browser_thread_bundle.h"	29 #include "content/public/test/test_browser_thread_bundle.h"

29 #include "content/public/test/test_utils.h"	30 #include "content/public/test/test_utils.h"

30 #include "testing/gtest/include/gtest/gtest.h"	31 #include "testing/gtest/include/gtest/gtest.h"

31	32

32 #if defined(ENABLE_EXTENSIONS)	33 #if defined(ENABLE_EXTENSIONS)

33 #include "chrome/browser/extensions/extension_service.h"	34 #include "chrome/browser/extensions/extension_service.h"

34 #include "chrome/browser/extensions/extension_service_test_base.h"	35 #include "chrome/browser/extensions/extension_service_test_base.h"

35 #include "chrome/browser/extensions/unpacked_installer.h"	36 #include "chrome/browser/extensions/unpacked_installer.h"

36 #include "chrome/common/extensions/features/feature_channel.h"	37 #include "chrome/common/extensions/features/feature_channel.h"

37 #include "extensions/common/extension.h"	38 #include "extensions/common/extension.h"

(...skipping 543 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
581 ASSERT_EQ(1u, site_list_observer_.sites().size());	582 ASSERT_EQ(1u, site_list_observer_.sites().size());

582 EXPECT_EQ(base::ASCIIToUTF16("Moose"), site_list_observer_.sites()[0].name);	583 EXPECT_EQ(base::ASCIIToUTF16("Moose"), site_list_observer_.sites()[0].name);

583	584

584 url_filter_observer_.Wait();	585 url_filter_observer_.Wait();

585 EXPECT_EQ(SupervisedUserURLFilter::WARN,	586 EXPECT_EQ(SupervisedUserURLFilter::WARN,

586 url_filter->GetFilteringBehaviorForURL(example_url));	587 url_filter->GetFilteringBehaviorForURL(example_url));

587 EXPECT_EQ(SupervisedUserURLFilter::ALLOW,	588 EXPECT_EQ(SupervisedUserURLFilter::ALLOW,

588 url_filter->GetFilteringBehaviorForURL(moose_url));	589 url_filter->GetFilteringBehaviorForURL(moose_url));

589 }	590 }

590 #endif // defined(ENABLE_EXTENSIONS)	591 #endif // defined(ENABLE_EXTENSIONS)

OLD	NEW