| 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/prefs/pref_service.h" | 6 #include "base/prefs/pref_service.h" |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
| 10 #include "chrome/browser/history/history_service_factory.h" | 10 #include "chrome/browser/history/history_service_factory.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 // Tests the filter mode in which all sites are blocked by default. | 47 // Tests the filter mode in which all sites are blocked by default. |
| 48 class SupervisedUserBlockModeTest : public InProcessBrowserTest { | 48 class SupervisedUserBlockModeTest : public InProcessBrowserTest { |
| 49 public: | 49 public: |
| 50 // Indicates whether the interstitial should proceed or not. | 50 // Indicates whether the interstitial should proceed or not. |
| 51 enum InterstitialAction { | 51 enum InterstitialAction { |
| 52 INTERSTITIAL_PROCEED, | 52 INTERSTITIAL_PROCEED, |
| 53 INTERSTITIAL_DONTPROCEED, | 53 INTERSTITIAL_DONTPROCEED, |
| 54 }; | 54 }; |
| 55 | 55 |
| 56 SupervisedUserBlockModeTest() : supervised_user_service_(NULL) {} | 56 SupervisedUserBlockModeTest() : supervised_user_service_(NULL) {} |
| 57 virtual ~SupervisedUserBlockModeTest() {} | 57 ~SupervisedUserBlockModeTest() override {} |
| 58 | 58 |
| 59 void CheckShownPageIsInterstitial(WebContents* tab) { | 59 void CheckShownPageIsInterstitial(WebContents* tab) { |
| 60 CheckShownPage(tab, content::PAGE_TYPE_INTERSTITIAL); | 60 CheckShownPage(tab, content::PAGE_TYPE_INTERSTITIAL); |
| 61 } | 61 } |
| 62 | 62 |
| 63 void CheckShownPageIsNotInterstitial(WebContents* tab) { | 63 void CheckShownPageIsNotInterstitial(WebContents* tab) { |
| 64 CheckShownPage(tab, content::PAGE_TYPE_NORMAL); | 64 CheckShownPage(tab, content::PAGE_TYPE_NORMAL); |
| 65 } | 65 } |
| 66 | 66 |
| 67 // Checks to see if the type of the current page is |page_type|. | 67 // Checks to see if the type of the current page is |page_type|. |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 scoped_refptr<SupervisedUserURLFilter> filter = | 307 scoped_refptr<SupervisedUserURLFilter> filter = |
| 308 supervised_user_service_->GetURLFilterForUIThread(); | 308 supervised_user_service_->GetURLFilterForUIThread(); |
| 309 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, | 309 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, |
| 310 filter->GetFilteringBehaviorForURL(test_url.GetWithEmptyPath())); | 310 filter->GetFilteringBehaviorForURL(test_url.GetWithEmptyPath())); |
| 311 | 311 |
| 312 observer.Wait(); | 312 observer.Wait(); |
| 313 EXPECT_EQ(test_url, web_contents->GetURL()); | 313 EXPECT_EQ(test_url, web_contents->GetURL()); |
| 314 } | 314 } |
| 315 | 315 |
| 316 } // namespace | 316 } // namespace |
| OLD | NEW |