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

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

Issue 11826059: Add ManagedUserService for profile-specific managed user data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android test Created 7 years, 11 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_url_filter_unittest.cc
diff --git a/chrome/browser/managed_mode/managed_mode_url_filter_unittest.cc b/chrome/browser/managed_mode/managed_mode_url_filter_unittest.cc
index 1fbcf70dbaf61c99404c29c3dd10d66930c161ed..f692c61593ae858e9a79c3f42194af379e71bfa3 100644
--- a/chrome/browser/managed_mode/managed_mode_url_filter_unittest.cc
+++ b/chrome/browser/managed_mode/managed_mode_url_filter_unittest.cc
@@ -10,44 +10,14 @@
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace {
-
-class FailClosureHelper : public base::RefCountedThreadSafe<FailClosureHelper> {
- public:
- explicit FailClosureHelper(const base::Closure& cb) : closure_runner_(cb) {}
-
- void Fail() {
- FAIL();
- }
-
- private:
- friend class base::RefCountedThreadSafe<FailClosureHelper>;
-
- virtual ~FailClosureHelper() {}
-
- base::ScopedClosureRunner closure_runner_;
-};
-
-// Returns a closure that FAILs when it is called. As soon as the closure is
-// destroyed (because the last reference to it is dropped), |continuation| is
-// called.
-base::Closure FailClosure(const base::Closure& continuation) {
- scoped_refptr<FailClosureHelper> helper = new FailClosureHelper(continuation);
- return base::Bind(&FailClosureHelper::Fail, helper);
-}
-
-} // namespace
-
class ManagedModeURLFilterTest : public ::testing::Test {
public:
- ManagedModeURLFilterTest() {}
- virtual ~ManagedModeURLFilterTest() {}
-
- virtual void SetUp() OVERRIDE {
- filter_.reset(new ManagedModeURLFilter);
+ ManagedModeURLFilterTest() : filter_(new ManagedModeURLFilter) {
filter_->SetDefaultFilteringBehavior(ManagedModeURLFilter::BLOCK);
}
+ virtual ~ManagedModeURLFilterTest() {}
+
protected:
bool IsURLWhitelisted(const std::string& url) {
return filter_->GetFilteringBehaviorForURL(GURL(url)) ==
@@ -56,7 +26,7 @@ class ManagedModeURLFilterTest : public ::testing::Test {
MessageLoop message_loop_;
base::RunLoop run_loop_;
- scoped_ptr<ManagedModeURLFilter> filter_;
+ scoped_refptr<ManagedModeURLFilter> filter_;
};
TEST_F(ManagedModeURLFilterTest, Basic) {
@@ -93,15 +63,6 @@ TEST_F(ManagedModeURLFilterTest, Inactive) {
EXPECT_TRUE(IsURLWhitelisted("https://www.example.com"));
}
-TEST_F(ManagedModeURLFilterTest, Shutdown) {
- std::vector<std::string> list;
- list.push_back("google.com");
- filter_->SetFromPatterns(list, FailClosure(run_loop_.QuitClosure()));
- // Destroy the filter before we set the URLMatcher.
- filter_.reset();
- run_loop_.Run();
-}
-
TEST_F(ManagedModeURLFilterTest, Scheme) {
std::vector<std::string> list;
// Filter only http, ftp and ws schemes.

Powered by Google App Engine
This is Rietveld 408576698