Commit 050bc103 authored by Carlos Caballero's avatar Carlos Caballero Committed by Commit Bot

[scheduling] Use ScopedTaskEnvironment instead of MessageLoop in data_use_measurement

MessageLoop will go away, eventually.

BUG=891670

Change-Id: I85b84b92eb544b02920139aad88a4fb9a31d830f
Reviewed-on: https://chromium-review.googlesource.com/c/1352418Reviewed-by: default avatarScott Little <sclittle@chromium.org>
Commit-Queue: Carlos Caballero <carlscab@google.com>
Cr-Commit-Position: refs/heads/master@{#613035}
parent 24a9832f
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
#include <string> #include <string>
#include "base/macros.h" #include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/test/metrics/histogram_tester.h" #include "base/test/metrics/histogram_tester.h"
#include "base/test/scoped_task_environment.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "components/data_use_measurement/core/data_use_ascriber.h" #include "components/data_use_measurement/core/data_use_ascriber.h"
#include "components/data_use_measurement/core/data_use_recorder.h" #include "components/data_use_measurement/core/data_use_recorder.h"
...@@ -228,7 +228,8 @@ class DataUseMeasurementTest : public testing::Test { ...@@ -228,7 +228,8 @@ class DataUseMeasurementTest : public testing::Test {
context_->Init(); context_->Init();
} }
base::MessageLoopForIO loop_; base::test::ScopedTaskEnvironment task_environment_{
base::test::ScopedTaskEnvironment::MainThreadType::IO};
TestDataUseAscriber ascriber_; TestDataUseAscriber ascriber_;
TestURLRequestClassifier* url_request_classifier_; TestURLRequestClassifier* url_request_classifier_;
......
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
#include <memory> #include <memory>
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/test/metrics/histogram_tester.h" #include "base/test/metrics/histogram_tester.h"
#include "base/test/scoped_task_environment.h"
#include "components/data_use_measurement/core/data_use_ascriber.h" #include "components/data_use_measurement/core/data_use_ascriber.h"
#include "components/data_use_measurement/core/url_request_classifier.h" #include "components/data_use_measurement/core/url_request_classifier.h"
#include "components/metrics/data_use_tracker.h" #include "components/metrics/data_use_tracker.h"
...@@ -106,7 +106,8 @@ std::unique_ptr<net::URLRequest> RequestURL( ...@@ -106,7 +106,8 @@ std::unique_ptr<net::URLRequest> RequestURL(
if (redirect) if (redirect)
socket_factory->AddSocketDataProvider(&redirect_socket_data_provider); socket_factory->AddSocketDataProvider(&redirect_socket_data_provider);
net::MockRead response_mock_reads[] = { net::MockRead response_mock_reads[] = {
net::MockRead("HTTP/1.1 200 OK\r\n\r\n"), net::MockRead("response body"), net::MockRead("HTTP/1.1 200 OK\r\n\r\n"),
net::MockRead("response body"),
net::MockRead(net::SYNCHRONOUS, net::OK), net::MockRead(net::SYNCHRONOUS, net::OK),
}; };
const auto traffic_annotation = const auto traffic_annotation =
...@@ -155,7 +156,8 @@ class DataUseNetworkDelegateTest : public testing::Test { ...@@ -155,7 +156,8 @@ class DataUseNetworkDelegateTest : public testing::Test {
} }
private: private:
base::MessageLoopForIO message_loop_; base::test::ScopedTaskEnvironment task_environment_{
base::test::ScopedTaskEnvironment::MainThreadType::IO};
net::MockClientSocketFactory mock_socket_factory_; net::MockClientSocketFactory mock_socket_factory_;
net::TestURLRequestContext context_; net::TestURLRequestContext context_;
TestDataUseAscriber test_data_use_ascriber_; TestDataUseAscriber test_data_use_ascriber_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment