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

Side by Side Diff: chrome/browser/supervised_user/experimental/supervised_user_async_url_checker_unittest.cc

Issue 1239993004: Fix all failed and canceled URLRequestStatuses without errors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix more failures Created 5 years, 4 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 unified diff | Download patch
OLDNEW
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 <string> 5 #include <string>
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/thread_task_runner_handle.h" 11 #include "base/thread_task_runner_handle.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/browser/supervised_user/experimental/supervised_user_async_url_ checker.h" 13 #include "chrome/browser/supervised_user/experimental/supervised_user_async_url_ checker.h"
14 #include "net/base/net_errors.h"
14 #include "net/url_request/test_url_fetcher_factory.h" 15 #include "net/url_request/test_url_fetcher_factory.h"
15 #include "net/url_request/url_request_test_util.h" 16 #include "net/url_request/url_request_test_util.h"
16 #include "testing/gmock/include/gmock/gmock.h" 17 #include "testing/gmock/include/gmock/gmock.h"
17 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
18 #include "url/gurl.h" 19 #include "url/gurl.h"
19 20
20 using testing::_; 21 using testing::_;
21 22
22 namespace { 23 namespace {
23 24
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 } 88 }
88 89
89 net::TestURLFetcher* GetURLFetcher(bool safe) { 90 net::TestURLFetcher* GetURLFetcher(bool safe) {
90 int id = safe ? kSupervisedUserAsyncURLCheckerSafeURLFetcherID 91 int id = safe ? kSupervisedUserAsyncURLCheckerSafeURLFetcherID
91 : kSupervisedUserAsyncURLCheckerUnsafeURLFetcherID; 92 : kSupervisedUserAsyncURLCheckerUnsafeURLFetcherID;
92 net::TestURLFetcher* url_fetcher = url_fetcher_factory_.GetFetcherByID(id); 93 net::TestURLFetcher* url_fetcher = url_fetcher_factory_.GetFetcherByID(id);
93 EXPECT_TRUE(url_fetcher); 94 EXPECT_TRUE(url_fetcher);
94 return url_fetcher; 95 return url_fetcher;
95 } 96 }
96 97
97 void SendResponse(bool safe, 98 void SendResponse(bool safe, net::Error error, const std::string& response) {
98 net::URLRequestStatus::Status status,
99 const std::string& response) {
100 net::TestURLFetcher* url_fetcher = GetURLFetcher(safe); 99 net::TestURLFetcher* url_fetcher = GetURLFetcher(safe);
101 url_fetcher->set_status(net::URLRequestStatus(status, 0)); 100 url_fetcher->set_status(net::URLRequestStatus::FromError(error));
102 url_fetcher->set_response_code(net::HTTP_OK); 101 url_fetcher->set_response_code(net::HTTP_OK);
103 url_fetcher->SetResponseString(response); 102 url_fetcher->SetResponseString(response);
104 url_fetcher->delegate()->OnURLFetchComplete(url_fetcher); 103 url_fetcher->delegate()->OnURLFetchComplete(url_fetcher);
105 } 104 }
106 105
107 void SendValidResponse(bool safe, const GURL& url) { 106 void SendValidResponse(bool safe, const GURL& url) {
108 SendResponse(safe, net::URLRequestStatus::SUCCESS, BuildResponse(url)); 107 SendResponse(safe, net::OK, BuildResponse(url));
109 } 108 }
110 109
111 void SendFailedResponse(bool safe) { 110 void SendFailedResponse(bool safe) {
112 SendResponse(safe, net::URLRequestStatus::CANCELED, std::string()); 111 SendResponse(safe, net::ERR_ABORTED, std::string());
113 } 112 }
114 113
115 size_t next_url_; 114 size_t next_url_;
116 base::MessageLoop message_loop_; 115 base::MessageLoop message_loop_;
117 scoped_refptr<net::TestURLRequestContextGetter> request_context_; 116 scoped_refptr<net::TestURLRequestContextGetter> request_context_;
118 net::TestURLFetcherFactory url_fetcher_factory_; 117 net::TestURLFetcherFactory url_fetcher_factory_;
119 SupervisedUserAsyncURLChecker checker_; 118 SupervisedUserAsyncURLChecker checker_;
120 }; 119 };
121 120
122 TEST_F(SupervisedUserAsyncURLCheckerTest, Simple) { 121 TEST_F(SupervisedUserAsyncURLCheckerTest, Simple) {
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 TEST_F(SupervisedUserAsyncURLCheckerTest, CoalesceRequestsToSameURL) { 221 TEST_F(SupervisedUserAsyncURLCheckerTest, CoalesceRequestsToSameURL) {
223 GURL url(GetNewURL()); 222 GURL url(GetNewURL());
224 // Start two checks for the same URL. 223 // Start two checks for the same URL.
225 EXPECT_FALSE(CheckURL(url)); 224 EXPECT_FALSE(CheckURL(url));
226 EXPECT_FALSE(CheckURL(url)); 225 EXPECT_FALSE(CheckURL(url));
227 // A single response should answer both checks. 226 // A single response should answer both checks.
228 EXPECT_CALL(*this, OnCheckDone(url, SupervisedUserURLFilter::ALLOW, false)) 227 EXPECT_CALL(*this, OnCheckDone(url, SupervisedUserURLFilter::ALLOW, false))
229 .Times(2); 228 .Times(2);
230 SendValidResponse(true, url); 229 SendValidResponse(true, url);
231 } 230 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698