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

Side by Side Diff: components/data_use_measurement/core/data_use_measurement_unittest.cc

Issue 2842833003: Update SupportsUserData uses with unique_ptr. (Closed)
Patch Set: rebase Created 3 years, 7 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/data_use_measurement/core/data_use_measurement.h" 5 #include "components/data_use_measurement/core/data_use_measurement.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 25 matching lines...) Expand all
36 public: 36 public:
37 static const void* const kUserDataKey; 37 static const void* const kUserDataKey;
38 38
39 TestURLRequestClassifier() : content_type_(DataUseUserData::OTHER) {} 39 TestURLRequestClassifier() : content_type_(DataUseUserData::OTHER) {}
40 40
41 bool IsUserRequest(const net::URLRequest& request) const override { 41 bool IsUserRequest(const net::URLRequest& request) const override {
42 return request.GetUserData(kUserDataKey) != nullptr; 42 return request.GetUserData(kUserDataKey) != nullptr;
43 } 43 }
44 44
45 static void MarkAsUserRequest(net::URLRequest* request) { 45 static void MarkAsUserRequest(net::URLRequest* request) {
46 request->SetUserData(kUserDataKey, new TestURLRequestClassifier()); 46 request->SetUserData(kUserDataKey,
47 base::MakeUnique<TestURLRequestClassifier>());
47 } 48 }
48 49
49 DataUseUserData::DataUseContentType GetContentType( 50 DataUseUserData::DataUseContentType GetContentType(
50 const net::URLRequest& request, 51 const net::URLRequest& request,
51 const net::HttpResponseHeaders& response_headers) const override { 52 const net::HttpResponseHeaders& response_headers) const override {
52 return content_type_; 53 return content_type_;
53 } 54 }
54 55
55 void set_content_type(DataUseUserData::DataUseContentType content_type) { 56 void set_content_type(DataUseUserData::DataUseContentType content_type) {
56 content_type_ = content_type; 57 content_type_ = content_type;
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 socket_factory_->AddSocketDataProvider(&socket_data); 136 socket_factory_->AddSocketDataProvider(&socket_data);
136 137
137 std::unique_ptr<net::URLRequest> request( 138 std::unique_ptr<net::URLRequest> request(
138 context_->CreateRequest(GURL("http://foo.com"), net::DEFAULT_PRIORITY, 139 context_->CreateRequest(GURL("http://foo.com"), net::DEFAULT_PRIORITY,
139 &test_delegate, TRAFFIC_ANNOTATION_FOR_TESTS)); 140 &test_delegate, TRAFFIC_ANNOTATION_FOR_TESTS));
140 if (is_user_request == kUserRequest) { 141 if (is_user_request == kUserRequest) {
141 TestURLRequestClassifier::MarkAsUserRequest(request.get()); 142 TestURLRequestClassifier::MarkAsUserRequest(request.get());
142 } else { 143 } else {
143 request->SetUserData( 144 request->SetUserData(
144 data_use_measurement::DataUseUserData::kUserDataKey, 145 data_use_measurement::DataUseUserData::kUserDataKey,
145 new data_use_measurement::DataUseUserData( 146 base::MakeUnique<data_use_measurement::DataUseUserData>(
146 data_use_measurement::DataUseUserData::SUGGESTIONS, 147 data_use_measurement::DataUseUserData::SUGGESTIONS,
147 data_use_measurement_.CurrentAppState())); 148 data_use_measurement_.CurrentAppState()));
148 } 149 }
149 150
150 request->Start(); 151 request->Start();
151 base::RunLoop().RunUntilIdle(); 152 base::RunLoop().RunUntilIdle();
152 return request; 153 return request;
153 } 154 }
154 155
155 // Sends a request and reports data use attaching either user data or service 156 // Sends a request and reports data use attaching either user data or service
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 506
506 histogram_tester.ExpectUniqueSample("DataUse.ContentType.UserTraffic", 507 histogram_tester.ExpectUniqueSample("DataUse.ContentType.UserTraffic",
507 DataUseUserData::VIDEO_APPBACKGROUND, 508 DataUseUserData::VIDEO_APPBACKGROUND,
508 1000); 509 1000);
509 } 510 }
510 } 511 }
511 512
512 #endif 513 #endif
513 514
514 } // namespace data_use_measurement 515 } // namespace data_use_measurement
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698