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

Unified Diff: chrome/browser/managed_mode/managed_mode_resource_throttle_browsertest.cc

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments (+ a few other cleanups) Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/managed_mode/managed_mode_resource_throttle_browsertest.cc
diff --git a/chrome/browser/managed_mode/managed_mode_resource_throttle_browsertest.cc b/chrome/browser/managed_mode/managed_mode_resource_throttle_browsertest.cc
deleted file mode 100644
index 5b5baf872a9be305b74f351275be2deb8c9d1e27..0000000000000000000000000000000000000000
--- a/chrome/browser/managed_mode/managed_mode_resource_throttle_browsertest.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-// 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 "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/ui/browser.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/test/base/ui_test_utils.h"
-#include "content/public/browser/navigation_entry.h"
-#include "content/public/browser/web_contents.h"
-#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 {
- protected:
- ManagedModeResourceThrottleTest() : managed_user_service_(NULL) {}
- virtual ~ManagedModeResourceThrottleTest() {}
-
- private:
- virtual void SetUpOnMainThread() OVERRIDE;
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
-
- ManagedUserService* managed_user_service_;
-};
-
-void ManagedModeResourceThrottleTest::SetUpOnMainThread() {
- managed_user_service_ =
- ManagedUserServiceFactory::GetForProfile(browser()->profile());
-}
-
-void ManagedModeResourceThrottleTest::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,
- NoNavigationObserverBlock) {
- Profile* profile = browser()->profile();
- ManagedUserSettingsService* managed_user_settings_service =
- ManagedUserSettingsServiceFactory::GetForProfile(profile);
- managed_user_settings_service->SetLocalSettingForTesting(
- managed_users::kContentPackDefaultFilteringBehavior,
- scoped_ptr<base::Value>(
- new base::FundamentalValue(ManagedModeURLFilter::BLOCK)));
-
- scoped_ptr<WebContents> web_contents(
- WebContents::Create(WebContents::CreateParams(profile)));
- NavigationController& controller = web_contents->GetController();
- content::TestNavigationObserver observer(web_contents.get());
- controller.LoadURL(GURL("http://www.example.com"), content::Referrer(),
- content::PAGE_TRANSITION_TYPED, std::string());
- observer.Wait();
- content::NavigationEntry* entry = controller.GetActiveEntry();
- ASSERT_TRUE(entry);
- EXPECT_EQ(content::PAGE_TYPE_INTERSTITIAL, entry->GetPageType());
-}
« no previous file with comments | « chrome/browser/managed_mode/managed_mode_resource_throttle.cc ('k') | chrome/browser/managed_mode/managed_mode_site_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698