Remove LOAD_SUB_FRAME load flag.

chrome/browser/policy/url_blacklist_manager_unittest.cc

 // Copyright (c) 2012 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 "components/policy/core/browser/url_blacklist_manager.h"
 
 #include <ostream>
 
 #include "base/basictypes.h"
+#include "base/bind.h"
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/policy/policy_helpers.h"
 #include "components/policy/core/common/policy_pref_names.h"
 #include "components/url_fixer/url_fixer.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
-#include "net/base/request_priority.h"
-#include "net/url_request/url_request.h"
-#include "net/url_request/url_request_context.h"
-#include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 // TODO(joaodasilva): this file should be moved next to
 // components/policy/core/browser/url_blacklist_manager.(cc|h).
 // However, url_fixer_upper.h can't be included from the component. Rather
 // than having it mocked out, the actual url_fixer::SegmentURL call is used
 // to make sure that the parsing of URL filters is correct.
 
 namespace policy {
@@ skipping 600 matching lines @@
 }
 
 TEST_F(URLBlacklistManagerTest, DontBlockResources) {
   scoped_ptr<URLBlacklist> blacklist(new URLBlacklist(GetSegmentURLCallback()));
   scoped_ptr<base::ListValue> blocked(new base::ListValue);
   blocked->Append(new base::StringValue("google.com"));
   blacklist->Block(blocked.get());
   blacklist_manager_->SetBlacklist(blacklist.Pass());
   EXPECT_TRUE(blacklist_manager_->IsURLBlocked(GURL("http://google.com")));
 
-  net::TestURLRequestContext context;
-  scoped_ptr<net::URLRequest> request(context.CreateRequest(
-      GURL("http://google.com"), net::DEFAULT_PRIORITY, NULL));
-
   int reason = net::ERR_UNEXPECTED;
-  // Background requests aren't filtered.
-  EXPECT_FALSE(blacklist_manager_->IsRequestBlocked(*request.get(), &reason));
-
-  // Main frames are filtered.
-  request->SetLoadFlags(net::LOAD_MAIN_FRAME);
-  EXPECT_TRUE(blacklist_manager_->IsRequestBlocked(*request.get(), &reason));
-  EXPECT_EQ(net::ERR_BLOCKED_BY_ADMINISTRATOR, reason);
+  EXPECT_TRUE(blacklist_manager_->ShouldBlockRequestForFrame(
+      GURL("http://google.com"), &reason));

[Andrew T Wilson (Slow), 2015/05/12 16:44:30]

This is no longer checking the reason for the request being blocked - should
this also have:

EXPECT_EQ(net::ERR_BLOCKED_BY_ADMINISTRATOR, reason);

?

Also, we are assuming that ShouldBlockRequestForFrame() won't be called for
subresource requests - is there any test that ensure this is true?

[mmenke, 2015/05/12 16:59:13]

Yea, it should still check that (Added back).
I'm not sure it looks like PolicyTest.URLBlacklist and
PolicyTest.FileURLBlacklist may be the only browser tests, and they don't seem
to check it.

The test coverage situation isn't actually much different than it was before, as
there are no tests that make sure we actually set LOAD_SUB_FRAME in the first
place, as this CL demonstrates.

[mmenke, 2015/05/12 17:04:07]

I'm happy to add an integration test in a followup CL, should be simple enough,
but seems a bit beyond the scope of this one.

 }
 
 TEST_F(URLBlacklistManagerTest, DefaultBlacklistExceptions) {
   URLBlacklist blacklist(GetSegmentURLCallback());
   scoped_ptr<base::ListValue> blocked(new base::ListValue);
 
   // Blacklist everything:
   blocked->Append(new base::StringValue("*"));
   blacklist.Block(blocked.get());
 
@@ skipping 11 matching lines @@
   blacklist.Allow(allowed.get());
 
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://www.google.com")));
   EXPECT_TRUE((blacklist.IsURLBlocked(GURL("chrome-extension://xyz"))));
   EXPECT_FALSE((blacklist.IsURLBlocked(GURL("chrome-extension://abc"))));
   EXPECT_FALSE((blacklist.IsURLBlocked(GURL("chrome-search://local-ntp"))));
   EXPECT_FALSE((blacklist.IsURLBlocked(GURL("chrome-native://ntp"))));
 }
 
 }  // namespace policy