Index: chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc |
diff --git a/chrome/browser/managed_mode/managed_mode_resource_throttle_browsertest.cc b/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc |
similarity index 57% |
rename from chrome/browser/managed_mode/managed_mode_resource_throttle_browsertest.cc |
rename to chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc |
index 5b5baf872a9be305b74f351275be2deb8c9d1e27..15e1aeaecba03d83aa401dc281a8e6dbef794070 100644 |
--- a/chrome/browser/managed_mode/managed_mode_resource_throttle_browsertest.cc |
+++ b/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc |
@@ -2,17 +2,17 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/browser/managed_mode/managed_mode_resource_throttle.h" |
+#include "chrome/browser/supervised_user/supervised_user_resource_throttle.h" |
#include "base/command_line.h" |
#include "base/prefs/pref_service.h" |
#include "base/values.h" |
-#include "chrome/browser/managed_mode/managed_user_constants.h" |
-#include "chrome/browser/managed_mode/managed_user_service.h" |
-#include "chrome/browser/managed_mode/managed_user_service_factory.h" |
-#include "chrome/browser/managed_mode/managed_user_settings_service.h" |
-#include "chrome/browser/managed_mode/managed_user_settings_service_factory.h" |
#include "chrome/browser/profiles/profile.h" |
+#include "chrome/browser/supervised_user/supervised_user_constants.h" |
+#include "chrome/browser/supervised_user/supervised_user_service.h" |
+#include "chrome/browser/supervised_user/supervised_user_service_factory.h" |
+#include "chrome/browser/supervised_user/supervised_user_settings_service.h" |
+#include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/common/chrome_switches.h" |
#include "chrome/test/base/in_process_browser_test.h" |
@@ -22,45 +22,44 @@ |
#include "content/public/common/page_type.h" |
#include "content/public/test/test_navigation_observer.h" |
#include "content/public/test/test_utils.h" |
-#include "content/public/test/test_utils.h" |
using content::MessageLoopRunner; |
using content::NavigationController; |
using content::WebContents; |
-class ManagedModeResourceThrottleTest : public InProcessBrowserTest { |
+class SupervisedUserResourceThrottleTest : public InProcessBrowserTest { |
protected: |
- ManagedModeResourceThrottleTest() : managed_user_service_(NULL) {} |
- virtual ~ManagedModeResourceThrottleTest() {} |
+ SupervisedUserResourceThrottleTest() : supervised_user_service_(NULL) {} |
+ virtual ~SupervisedUserResourceThrottleTest() {} |
private: |
virtual void SetUpOnMainThread() OVERRIDE; |
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; |
- ManagedUserService* managed_user_service_; |
+ SupervisedUserService* supervised_user_service_; |
}; |
-void ManagedModeResourceThrottleTest::SetUpOnMainThread() { |
- managed_user_service_ = |
- ManagedUserServiceFactory::GetForProfile(browser()->profile()); |
+void SupervisedUserResourceThrottleTest::SetUpOnMainThread() { |
+ supervised_user_service_ = |
+ SupervisedUserServiceFactory::GetForProfile(browser()->profile()); |
} |
-void ManagedModeResourceThrottleTest::SetUpCommandLine( |
+void SupervisedUserResourceThrottleTest::SetUpCommandLine( |
CommandLine* command_line) { |
command_line->AppendSwitchASCII(switches::kSupervisedUserId, "asdf"); |
} |
// Tests that showing the blocking interstitial for a WebContents without a |
-// ManagedModeNavigationObserver doesn't crash. |
-IN_PROC_BROWSER_TEST_F(ManagedModeResourceThrottleTest, |
+// SupervisedUserNavigationObserver doesn't crash. |
+IN_PROC_BROWSER_TEST_F(SupervisedUserResourceThrottleTest, |
NoNavigationObserverBlock) { |
Profile* profile = browser()->profile(); |
- ManagedUserSettingsService* managed_user_settings_service = |
- ManagedUserSettingsServiceFactory::GetForProfile(profile); |
- managed_user_settings_service->SetLocalSettingForTesting( |
- managed_users::kContentPackDefaultFilteringBehavior, |
+ SupervisedUserSettingsService* supervised_user_settings_service = |
+ SupervisedUserSettingsServiceFactory::GetForProfile(profile); |
+ supervised_user_settings_service->SetLocalSettingForTesting( |
+ supervised_users::kContentPackDefaultFilteringBehavior, |
scoped_ptr<base::Value>( |
- new base::FundamentalValue(ManagedModeURLFilter::BLOCK))); |
+ new base::FundamentalValue(SupervisedUserURLFilter::BLOCK))); |
scoped_ptr<WebContents> web_contents( |
WebContents::Create(WebContents::CreateParams(profile))); |