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

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

Issue 2479593006: Move enable extensions define to a build flag. (Closed)
Patch Set: Merge Created 4 years, 1 month 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" 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>
(...skipping 20 matching lines...) Expand all
31 #include "chrome/common/chrome_paths.h" 31 #include "chrome/common/chrome_paths.h"
32 #include "chrome/common/pref_names.h" 32 #include "chrome/common/pref_names.h"
33 #include "chrome/test/base/testing_profile.h" 33 #include "chrome/test/base/testing_profile.h"
34 #include "components/prefs/pref_service.h" 34 #include "components/prefs/pref_service.h"
35 #include "components/prefs/scoped_user_pref_update.h" 35 #include "components/prefs/scoped_user_pref_update.h"
36 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" 36 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
37 #include "components/signin/core/browser/signin_manager.h" 37 #include "components/signin/core/browser/signin_manager.h"
38 #include "components/version_info/version_info.h" 38 #include "components/version_info/version_info.h"
39 #include "content/public/test/test_browser_thread_bundle.h" 39 #include "content/public/test/test_browser_thread_bundle.h"
40 #include "content/public/test/test_utils.h" 40 #include "content/public/test/test_utils.h"
41 #include "extensions/features/features.h"
41 #include "testing/gtest/include/gtest/gtest.h" 42 #include "testing/gtest/include/gtest/gtest.h"
42 43
43 #if defined(ENABLE_EXTENSIONS) 44 #if BUILDFLAG(ENABLE_EXTENSIONS)
44 #include "chrome/browser/extensions/extension_service.h" 45 #include "chrome/browser/extensions/extension_service.h"
45 #include "chrome/browser/extensions/extension_service_test_base.h" 46 #include "chrome/browser/extensions/extension_service_test_base.h"
46 #include "chrome/browser/extensions/extension_util.h" 47 #include "chrome/browser/extensions/extension_util.h"
47 #include "chrome/browser/extensions/unpacked_installer.h" 48 #include "chrome/browser/extensions/unpacked_installer.h"
48 #include "extensions/common/extension.h" 49 #include "extensions/common/extension.h"
49 #include "extensions/common/extension_builder.h" 50 #include "extensions/common/extension_builder.h"
50 #include "extensions/common/features/feature_channel.h" 51 #include "extensions/common/features/feature_channel.h"
51 #include "extensions/common/manifest_constants.h" 52 #include "extensions/common/manifest_constants.h"
52 53
53 using extensions::Extension; 54 using extensions::Extension;
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 creator->AnswerRequest(0, false); 359 creator->AnswerRequest(0, false);
359 ASSERT_EQ(1u, creator_2->requested_urls().size()); 360 ASSERT_EQ(1u, creator_2->requested_urls().size());
360 EXPECT_EQ(url.spec(), creator_2->requested_urls()[0].spec()); 361 EXPECT_EQ(url.spec(), creator_2->requested_urls()[0].spec());
361 362
362 // Make the second creator succeed, which will make the whole thing succeed. 363 // Make the second creator succeed, which will make the whole thing succeed.
363 creator_2->AnswerRequest(0, true); 364 creator_2->AnswerRequest(0, true);
364 EXPECT_TRUE(result_holder.GetResult()); 365 EXPECT_TRUE(result_holder.GetResult());
365 } 366 }
366 } 367 }
367 368
368 #if defined(ENABLE_EXTENSIONS) 369 #if BUILDFLAG(ENABLE_EXTENSIONS)
369 class SupervisedUserServiceExtensionTestBase 370 class SupervisedUserServiceExtensionTestBase
370 : public extensions::ExtensionServiceTestBase { 371 : public extensions::ExtensionServiceTestBase {
371 public: 372 public:
372 explicit SupervisedUserServiceExtensionTestBase(bool is_supervised) 373 explicit SupervisedUserServiceExtensionTestBase(bool is_supervised)
373 : is_supervised_(is_supervised), 374 : is_supervised_(is_supervised),
374 channel_(version_info::Channel::DEV) {} 375 channel_(version_info::Channel::DEV) {}
375 ~SupervisedUserServiceExtensionTestBase() override {} 376 ~SupervisedUserServiceExtensionTestBase() override {}
376 377
377 void SetUp() override { 378 void SetUp() override {
378 ExtensionServiceTestBase::SetUp(); 379 ExtensionServiceTestBase::SetUp();
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 EXPECT_EQ(id2, site_list_observer_.site_lists()[0]->id()); 676 EXPECT_EQ(id2, site_list_observer_.site_lists()[0]->id());
676 EXPECT_EQ(title2, site_list_observer_.site_lists()[0]->title()); 677 EXPECT_EQ(title2, site_list_observer_.site_lists()[0]->title());
677 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());
678 679
679 url_filter_observer_.Wait(); 680 url_filter_observer_.Wait();
680 EXPECT_EQ(SupervisedUserURLFilter::WARN, 681 EXPECT_EQ(SupervisedUserURLFilter::WARN,
681 url_filter->GetFilteringBehaviorForURL(youtube_url)); 682 url_filter->GetFilteringBehaviorForURL(youtube_url));
682 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, 683 EXPECT_EQ(SupervisedUserURLFilter::ALLOW,
683 url_filter->GetFilteringBehaviorForURL(moose_url)); 684 url_filter->GetFilteringBehaviorForURL(moose_url));
684 } 685 }
685 #endif // defined(ENABLE_EXTENSIONS) 686 #endif // BUILDFLAG(ENABLE_EXTENSIONS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698