| Index: android_webview/browser/aw_metrics_service_client_impl.cc
|
| diff --git a/android_webview/native/aw_metrics_service_client_impl.cc b/android_webview/browser/aw_metrics_service_client_impl.cc
|
| similarity index 94%
|
| rename from android_webview/native/aw_metrics_service_client_impl.cc
|
| rename to android_webview/browser/aw_metrics_service_client_impl.cc
|
| index 381fb9812c6583de2018fc9bf3406d3420edbde1..2baf2a158ae541d5824bd22eb0732aa666eb5d2f 100644
|
| --- a/android_webview/native/aw_metrics_service_client_impl.cc
|
| +++ b/android_webview/browser/aw_metrics_service_client_impl.cc
|
| @@ -2,11 +2,11 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "android_webview/native/aw_metrics_service_client_impl.h"
|
| +#include "android_webview/browser/aw_metrics_service_client_impl.h"
|
|
|
| +#include "android_webview/browser/aw_metrics_log_uploader.h"
|
| #include "android_webview/common/aw_version_info_values.h"
|
| #include "android_webview/jni/AwMetricsServiceClient_jni.h"
|
| -#include "android_webview/native/aw_metrics_log_uploader.h"
|
| #include "base/android/build_info.h"
|
| #include "base/bind.h"
|
| #include "base/files/file_util.h"
|
| @@ -82,7 +82,7 @@ void AwMetricsServiceClientImpl::Initialize(
|
| const base::FilePath guid_file_path) {
|
| 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;
|
| request_context_ = request_context;
|
| @@ -93,8 +93,7 @@ void AwMetricsServiceClientImpl::Initialize(
|
| // GUID, and then pick up where we left off, back on the UI thread, in
|
| // InitializeWithGUID.
|
| content::BrowserThread::PostTaskAndReply(
|
| - content::BrowserThread::FILE,
|
| - FROM_HERE,
|
| + content::BrowserThread::FILE, FROM_HERE,
|
| base::Bind(&GetOrCreateGUID, guid_file_path, guid),
|
| base::Bind(&AwMetricsServiceClientImpl::InitializeWithGUID,
|
| base::Unretained(this), base::Owned(guid)));
|
| @@ -226,17 +225,14 @@ base::TimeDelta AwMetricsServiceClientImpl::GetStandardUploadInterval() {
|
| }
|
|
|
| AwMetricsServiceClientImpl::AwMetricsServiceClientImpl()
|
| - : is_enabled_(false),
|
| - pref_service_(nullptr),
|
| - request_context_(nullptr) {}
|
| + : is_enabled_(false), pref_service_(nullptr), request_context_(nullptr) {}
|
|
|
| AwMetricsServiceClientImpl::~AwMetricsServiceClientImpl() {}
|
|
|
| // static
|
| -void SetMetricsEnabled(
|
| - JNIEnv* env,
|
| - const base::android::JavaParamRef<jclass>& jcaller,
|
| - jboolean enabled) {
|
| +void SetMetricsEnabled(JNIEnv* env,
|
| + const base::android::JavaParamRef<jclass>& jcaller,
|
| + jboolean enabled) {
|
| g_lazy_instance_.Pointer()->SetMetricsEnabled(enabled);
|
| }
|
|
|
|
|