Commit 748a892c authored by Paul Miller's avatar Paul Miller Committed by Commit Bot

WebView: Remove URLRequestContextGetter from AwMetricsServiceClient

It's been unused since commit a5febff9 and null since
6bd4db44.

BUG=546754

Change-Id: Idbffc047f67d3c424a2d6557e50dac8be9d9cee4
Reviewed-on: https://chromium-review.googlesource.com/1236695Reviewed-by: default avatarBo <boliu@chromium.org>
Commit-Queue: Paul Miller <paulmiller@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592971}
parent ae207459
...@@ -223,8 +223,7 @@ int AwBrowserMainParts::PreCreateThreads() { ...@@ -223,8 +223,7 @@ int AwBrowserMainParts::PreCreateThreads() {
browser_policy_connector_ = std::make_unique<AwBrowserPolicyConnector>(); browser_policy_connector_ = std::make_unique<AwBrowserPolicyConnector>();
pref_service_ = CreatePrefService(browser_policy_connector_.get()); pref_service_ = CreatePrefService(browser_policy_connector_.get());
AwMetricsServiceClient::GetInstance()->Initialize(pref_service_.get(), AwMetricsServiceClient::GetInstance()->Initialize(pref_service_.get());
nullptr);
aw_field_trial_creator_.SetUpFieldTrials(pref_service_.get()); aw_field_trial_creator_.SetUpFieldTrials(pref_service_.get());
return service_manager::RESULT_CODE_NORMAL_EXIT; return service_manager::RESULT_CODE_NORMAL_EXIT;
......
...@@ -133,15 +133,11 @@ std::string AwMetricsServiceClient::GetClientId() { ...@@ -133,15 +133,11 @@ std::string AwMetricsServiceClient::GetClientId() {
return g_client_id.Get(); return g_client_id.Get();
} }
void AwMetricsServiceClient::Initialize( void AwMetricsServiceClient::Initialize(PrefService* pref_service) {
PrefService* pref_service,
net::URLRequestContextGetter* request_context) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
DCHECK(pref_service_ == nullptr); // Initialize should only happen once. DCHECK(pref_service_ == nullptr); // Initialize should only happen once.
DCHECK(request_context_ == nullptr);
pref_service_ = pref_service; pref_service_ = pref_service;
request_context_ = request_context;
metrics_state_manager_ = metrics::MetricsStateManager::Create( metrics_state_manager_ = metrics::MetricsStateManager::Create(
pref_service_, this, base::string16(), pref_service_, this, base::string16(),
...@@ -273,7 +269,6 @@ base::TimeDelta AwMetricsServiceClient::GetStandardUploadInterval() { ...@@ -273,7 +269,6 @@ base::TimeDelta AwMetricsServiceClient::GetStandardUploadInterval() {
AwMetricsServiceClient::AwMetricsServiceClient() AwMetricsServiceClient::AwMetricsServiceClient()
: pref_service_(nullptr), : pref_service_(nullptr),
request_context_(nullptr),
consent_(false), consent_(false),
in_sample_(false) {} in_sample_(false) {}
......
...@@ -21,10 +21,6 @@ namespace base { ...@@ -21,10 +21,6 @@ namespace base {
class FilePath; class FilePath;
} }
namespace net {
class URLRequestContextGetter;
}
namespace metrics { namespace metrics {
class MetricsStateManager; class MetricsStateManager;
} }
...@@ -50,8 +46,7 @@ class AwMetricsServiceClient : public metrics::MetricsServiceClient, ...@@ -50,8 +46,7 @@ class AwMetricsServiceClient : public metrics::MetricsServiceClient,
// Return the cached client id. // Return the cached client id.
static std::string GetClientId(); static std::string GetClientId();
void Initialize(PrefService* pref_service, void Initialize(PrefService* pref_service);
net::URLRequestContextGetter* request_context);
std::unique_ptr<const base::FieldTrial::EntropyProvider> std::unique_ptr<const base::FieldTrial::EntropyProvider>
CreateLowEntropyProvider(); CreateLowEntropyProvider();
...@@ -92,7 +87,6 @@ class AwMetricsServiceClient : public metrics::MetricsServiceClient, ...@@ -92,7 +87,6 @@ class AwMetricsServiceClient : public metrics::MetricsServiceClient,
std::unique_ptr<metrics::MetricsStateManager> metrics_state_manager_; std::unique_ptr<metrics::MetricsStateManager> metrics_state_manager_;
std::unique_ptr<metrics::MetricsService> metrics_service_; std::unique_ptr<metrics::MetricsService> metrics_service_;
PrefService* pref_service_; PrefService* pref_service_;
net::URLRequestContextGetter* request_context_;
bool consent_; // = (user has consented) && !(app has opted out) bool consent_; // = (user has consented) && !(app has opted out)
bool in_sample_; // Is this client enabled by sampling? bool in_sample_; // Is this client enabled by sampling?
......
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