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

Side by Side Diff: chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc

Issue 2259523003: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_database_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // This test creates a safebrowsing service using test safebrowsing database 5 // This test creates a safebrowsing service using test safebrowsing database
6 // and a test protocol manager. It is used to test logics in safebrowsing 6 // and a test protocol manager. It is used to test logics in safebrowsing
7 // service. 7 // service.
8 8
9 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 9 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
10 10
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 const net::test_server::SendCompleteCallback& done) override { 109 const net::test_server::SendCompleteCallback& done) override {
110 // Do nothing. |done| is never called. 110 // Do nothing. |done| is never called.
111 } 111 }
112 }; 112 };
113 113
114 std::unique_ptr<net::test_server::HttpResponse> HandleNeverCompletingRequests( 114 std::unique_ptr<net::test_server::HttpResponse> HandleNeverCompletingRequests(
115 const net::test_server::HttpRequest& request) { 115 const net::test_server::HttpRequest& request) {
116 if (!base::StartsWith(request.relative_url, kNeverCompletesPath, 116 if (!base::StartsWith(request.relative_url, kNeverCompletesPath,
117 base::CompareCase::SENSITIVE)) 117 base::CompareCase::SENSITIVE))
118 return nullptr; 118 return nullptr;
119 return base::WrapUnique(new NeverCompletingHttpResponse()); 119 return base::MakeUnique<NeverCompletingHttpResponse>();
120 } 120 }
121 121
122 void InvokeFullHashCallback( 122 void InvokeFullHashCallback(
123 SafeBrowsingProtocolManager::FullHashCallback callback, 123 SafeBrowsingProtocolManager::FullHashCallback callback,
124 const std::vector<SBFullHashResult>& result) { 124 const std::vector<SBFullHashResult>& result) {
125 callback.Run(result, base::TimeDelta::FromMinutes(45)); 125 callback.Run(result, base::TimeDelta::FromMinutes(45));
126 } 126 }
127 127
128 // Helper function to set up protocol config. It is used to redirects safe 128 // Helper function to set up protocol config. It is used to redirects safe
129 // browsing queries to embeded test server. It needs to be called before 129 // browsing queries to embeded test server. It needs to be called before
(...skipping 1627 matching lines...) Expand 10 before | Expand all | Expand 10 after
1757 content::Source<SafeBrowsingDatabaseManager>( 1757 content::Source<SafeBrowsingDatabaseManager>(
1758 sb_factory_->test_safe_browsing_service()->database_manager().get())); 1758 sb_factory_->test_safe_browsing_service()->database_manager().get()));
1759 BrowserThread::PostTask( 1759 BrowserThread::PostTask(
1760 BrowserThread::IO, FROM_HERE, 1760 BrowserThread::IO, FROM_HERE,
1761 base::Bind(&SafeBrowsingDatabaseManagerCookieTest::ForceUpdate, 1761 base::Bind(&SafeBrowsingDatabaseManagerCookieTest::ForceUpdate,
1762 base::Unretained(this))); 1762 base::Unretained(this)));
1763 observer.Wait(); 1763 observer.Wait();
1764 } 1764 }
1765 1765
1766 } // namespace safe_browsing 1766 } // namespace safe_browsing
OLDNEW
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_database_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698