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

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

Issue 645043003: Cleanup: Prevent usage of various extension headers when extensions support is not compiled in. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 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 "base/path_service.h" 5 #include "base/path_service.h"
6 #include "base/prefs/pref_service.h" 6 #include "base/prefs/pref_service.h"
7 #include "base/prefs/scoped_user_pref_update.h" 7 #include "base/prefs/scoped_user_pref_update.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/chrome_notification_types.h" 9 #include "chrome/browser/chrome_notification_types.h"
10 #include "chrome/browser/extensions/extension_service.h"
11 #include "chrome/browser/extensions/extension_service_test_base.h"
12 #include "chrome/browser/extensions/unpacked_installer.h"
13 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" 11 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
15 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" 12 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
16 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 13 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
17 #include "chrome/browser/supervised_user/custodian_profile_downloader_service.h" 14 #include "chrome/browser/supervised_user/custodian_profile_downloader_service.h"
18 #include "chrome/browser/supervised_user/custodian_profile_downloader_service_fa ctory.h" 15 #include "chrome/browser/supervised_user/custodian_profile_downloader_service_fa ctory.h"
19 #include "chrome/browser/supervised_user/permission_request_creator.h" 16 #include "chrome/browser/supervised_user/permission_request_creator.h"
20 #include "chrome/browser/supervised_user/supervised_user_service.h" 17 #include "chrome/browser/supervised_user/supervised_user_service.h"
21 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" 18 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
22 #include "chrome/browser/ui/browser_list.h" 19 #include "chrome/browser/ui/browser_list.h"
23 #include "chrome/common/chrome_paths.h" 20 #include "chrome/common/chrome_paths.h"
24 #include "chrome/common/extensions/features/feature_channel.h"
25 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
26 #include "chrome/test/base/testing_profile.h" 22 #include "chrome/test/base/testing_profile.h"
27 #include "content/public/test/test_browser_thread_bundle.h" 23 #include "content/public/test/test_browser_thread_bundle.h"
28 #include "content/public/test/test_utils.h" 24 #include "content/public/test/test_utils.h"
25 #include "testing/gtest/include/gtest/gtest.h"
26
27 #if defined(ENABLE_EXTENSIONS)
28 #include "chrome/browser/extensions/extension_service.h"
29 #include "chrome/browser/extensions/extension_service_test_base.h"
30 #include "chrome/browser/extensions/unpacked_installer.h"
31 #include "chrome/common/extensions/features/feature_channel.h"
29 #include "extensions/common/extension.h" 32 #include "extensions/common/extension.h"
30 #include "extensions/common/extension_builder.h" 33 #include "extensions/common/extension_builder.h"
31 #include "extensions/common/manifest_constants.h" 34 #include "extensions/common/manifest_constants.h"
32 #include "testing/gtest/include/gtest/gtest.h" 35 #endif
33 36
34 using content::MessageLoopRunner; 37 using content::MessageLoopRunner;
35 38
36 namespace { 39 namespace {
37 40
38 void OnProfileDownloadedFail(const base::string16& full_name) { 41 void OnProfileDownloadedFail(const base::string16& full_name) {
39 ASSERT_TRUE(false) << "Profile download should not have succeeded."; 42 ASSERT_TRUE(false) << "Profile download should not have succeeded.";
40 } 43 }
41 44
42 class SupervisedUserURLFilterObserver : 45 class SupervisedUserURLFilterObserver :
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 creator->AnswerRequest(0, false); 321 creator->AnswerRequest(0, false);
319 ASSERT_EQ(1u, creator_2->requested_urls().size()); 322 ASSERT_EQ(1u, creator_2->requested_urls().size());
320 EXPECT_EQ(url.spec(), creator_2->requested_urls()[0].spec()); 323 EXPECT_EQ(url.spec(), creator_2->requested_urls()[0].spec());
321 324
322 // Make the second creator succeed, which will make the whole thing succeed. 325 // Make the second creator succeed, which will make the whole thing succeed.
323 creator_2->AnswerRequest(0, true); 326 creator_2->AnswerRequest(0, true);
324 EXPECT_TRUE(result_holder.GetResult()); 327 EXPECT_TRUE(result_holder.GetResult());
325 } 328 }
326 } 329 }
327 330
328 #if !defined(OS_ANDROID) 331 #if defined(ENABLE_EXTENSIONS)
329 class SupervisedUserServiceExtensionTestBase 332 class SupervisedUserServiceExtensionTestBase
330 : public extensions::ExtensionServiceTestBase { 333 : public extensions::ExtensionServiceTestBase {
331 public: 334 public:
332 explicit SupervisedUserServiceExtensionTestBase(bool is_supervised) 335 explicit SupervisedUserServiceExtensionTestBase(bool is_supervised)
333 : is_supervised_(is_supervised), 336 : is_supervised_(is_supervised),
334 channel_(chrome::VersionInfo::CHANNEL_DEV) {} 337 channel_(chrome::VersionInfo::CHANNEL_DEV) {}
335 virtual ~SupervisedUserServiceExtensionTestBase() {} 338 virtual ~SupervisedUserServiceExtensionTestBase() {}
336 339
337 virtual void SetUp() override { 340 virtual void SetUp() override {
338 ExtensionServiceTestBase::SetUp(); 341 ExtensionServiceTestBase::SetUp();
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 sites.clear(); 573 sites.clear();
571 site_lists[0]->GetSites(&sites); 574 site_lists[0]->GetSites(&sites);
572 ASSERT_EQ(1u, sites.size()); 575 ASSERT_EQ(1u, sites.size());
573 EXPECT_EQ(base::ASCIIToUTF16("Moose"), sites[0].name); 576 EXPECT_EQ(base::ASCIIToUTF16("Moose"), sites[0].name);
574 577
575 EXPECT_EQ(SupervisedUserURLFilter::WARN, 578 EXPECT_EQ(SupervisedUserURLFilter::WARN,
576 url_filter->GetFilteringBehaviorForURL(example_url)); 579 url_filter->GetFilteringBehaviorForURL(example_url));
577 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, 580 EXPECT_EQ(SupervisedUserURLFilter::ALLOW,
578 url_filter->GetFilteringBehaviorForURL(moose_url)); 581 url_filter->GetFilteringBehaviorForURL(moose_url));
579 } 582 }
580 #endif // !defined(OS_ANDROID) 583 #endif // defined(ENABLE_EXTENSIONS)
OLDNEW
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_impl.cc ('k') | chrome/browser/sync/glue/extensions_activity_monitor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698