Uplift of #21623 (squashed) to release

brave · Feb 7, 2024 · 6da45eb · 6da45eb
1 parent 6d32ba4
commit 6da45eb
Show file tree

Hide file tree

Showing 23 changed files with 335 additions and 34 deletions.
diff --git a/browser/sync/BUILD.gn b/browser/sync/BUILD.gn
@@ -11,6 +11,7 @@ source_set("sync") {
 
   deps = [
     "//base",
+    "//components/history/core/browser",
     "//components/sync/service",
     "//components/sync_device_info",
   ]

diff --git a/browser/sync/brave_sync_service_impl_delegate.cc b/browser/sync/brave_sync_service_impl_delegate.cc
@@ -12,15 +12,18 @@
 #include "base/metrics/histogram_functions.h"
 #include "base/task/single_thread_task_runner.h"
 #include "brave/components/sync/service/brave_sync_service_impl.h"
+#include "components/history/core/browser/history_service.h"
 #include "components/sync_device_info/device_info_sync_service.h"
 #include "components/sync_device_info/device_info_tracker.h"
 #include "components/sync_device_info/local_device_info_provider.h"
 
 namespace syncer {
 
 BraveSyncServiceImplDelegate::BraveSyncServiceImplDelegate(
-    DeviceInfoSyncService* device_info_sync_service)
+    DeviceInfoSyncService* device_info_sync_service,
+    history::HistoryService* history_service)
     : device_info_sync_service_(device_info_sync_service),
+      history_service_(history_service),
       weak_ptr_factory_(this) {
   DCHECK(device_info_sync_service_);
 
@@ -99,4 +102,15 @@ void BraveSyncServiceImplDelegate::SetLocalDeviceAppearedCallback(
   local_device_appeared_callback_ = std::move(local_device_appeared_callback);
 }
 
+void BraveSyncServiceImplDelegate::GetKnownToSyncHistoryCount(
+    base::OnceCallback<void(std::pair<bool, int>)> callback) {
+  history_service_->GetKnownToSyncCount(base::BindOnce(
+      [](base::OnceCallback<void(std::pair<bool, int>)> callback,
+         history::HistoryCountResult known_to_sync) {
+        std::move(callback).Run(
+            std::pair(known_to_sync.success, known_to_sync.count));
+      },
+      std::move(callback)));
+}
+
 }  // namespace syncer
diff --git a/browser/sync/brave_sync_service_impl_delegate.h b/browser/sync/brave_sync_service_impl_delegate.h
@@ -6,14 +6,17 @@
 #ifndef BRAVE_BROWSER_SYNC_BRAVE_SYNC_SERVICE_IMPL_DELEGATE_H_
 #define BRAVE_BROWSER_SYNC_BRAVE_SYNC_SERVICE_IMPL_DELEGATE_H_
 
-#include "brave/components/sync/service/sync_service_impl_delegate.h"
+#include <utility>
 
 #include "base/memory/raw_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observation.h"
+#include "brave/components/sync/service/sync_service_impl_delegate.h"
 #include "components/sync_device_info/device_info_tracker.h"
 
-class Profile;
+namespace history {
+class HistoryService;
+}  // namespace history
 
 namespace syncer {
 
@@ -29,7 +32,8 @@ class BraveSyncServiceImplDelegate
       public syncer::DeviceInfoTracker::Observer {
  public:
   explicit BraveSyncServiceImplDelegate(
-      DeviceInfoSyncService* device_info_sync_service);
+      DeviceInfoSyncService* device_info_sync_service,
+      history::HistoryService* history_service);
   ~BraveSyncServiceImplDelegate() override;
 
   void SuspendDeviceObserverForOwnReset() override;
@@ -38,6 +42,9 @@ class BraveSyncServiceImplDelegate
   void SetLocalDeviceAppearedCallback(
       base::OnceCallback<void()> local_device_appeared_callback) override;
 
+  void GetKnownToSyncHistoryCount(
+      base::OnceCallback<void(std::pair<bool, int>)> callback) override;
+
  private:
   // syncer::DeviceInfoTracker::Observer:
   void OnDeviceInfoChange() override;
@@ -54,6 +61,7 @@ class BraveSyncServiceImplDelegate
       device_info_observer_{this};
 
   raw_ptr<DeviceInfoSyncService> device_info_sync_service_ = nullptr;
+  raw_ptr<history::HistoryService> history_service_ = nullptr;
 
   // This is triggered once after SetLocalDeviceAppearedCallback
   // when the local device first appears in the changed synced devices list

diff --git a/chromium_src/chrome/browser/sync/sync_service_factory.cc b/chromium_src/chrome/browser/sync/sync_service_factory.cc
@@ -5,13 +5,16 @@
 
 #include "brave/browser/sync/brave_sync_service_impl_delegate.h"
 #include "brave/components/sync/service/brave_sync_service_impl.h"
+#include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/sync/device_info_sync_service_factory.h"
 
-#define BRAVE_BUILD_SERVICE_INSTANCE_FOR                      \
-  std::make_unique<syncer::BraveSyncServiceImpl>(             \
-      std::move(init_params),                                 \
-      std::make_unique<syncer::BraveSyncServiceImplDelegate>( \
-          DeviceInfoSyncServiceFactory::GetForProfile(profile)));
+#define BRAVE_BUILD_SERVICE_INSTANCE_FOR                        \
+  std::make_unique<syncer::BraveSyncServiceImpl>(               \
+      std::move(init_params),                                   \
+      std::make_unique<syncer::BraveSyncServiceImplDelegate>(   \
+          DeviceInfoSyncServiceFactory::GetForProfile(profile), \
+          HistoryServiceFactory::GetForProfile(                 \
+              profile, ServiceAccessType::IMPLICIT_ACCESS)));
 
 #include "src/chrome/browser/sync/sync_service_factory.cc"
 

diff --git a/chromium_src/components/history/core/browser/history_backend.cc b/chromium_src/components/history/core/browser/history_backend.cc
@@ -0,0 +1,15 @@
+/* Copyright (c) 2024 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#include "src/components/history/core/browser/history_backend.cc"
+
+namespace history {
+
+HistoryCountResult HistoryBackend::GetKnownToSyncCount() {
+  int count = 0;
+  return {db_ && db_->GetKnownToSyncCount(&count), count};
+}
+
+}  // namespace history
diff --git a/chromium_src/components/history/core/browser/history_backend.h b/chromium_src/components/history/core/browser/history_backend.h
@@ -0,0 +1,17 @@
+/* Copyright (c) 2024 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_BACKEND_H_
+#define BRAVE_CHROMIUM_SRC_COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_BACKEND_H_
+
+#define GetHistoryCount  \
+  GetKnownToSyncCount(); \
+  HistoryCountResult GetHistoryCount
+
+#include "src/components/history/core/browser/history_backend.h"  // IWYU pragma: export
+
+#undef GetHistoryCount
+
+#endif  // BRAVE_CHROMIUM_SRC_COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_BACKEND_H_
diff --git a/chromium_src/components/history/core/browser/history_service.cc b/chromium_src/components/history/core/browser/history_service.cc
@@ -0,0 +1,18 @@
+/* Copyright (c) 2024 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#include "src/components/history/core/browser/history_service.cc"
+
+namespace history {
+
+void HistoryService::GetKnownToSyncCount(
+    base::OnceCallback<void(HistoryCountResult)> callback) {
+  backend_task_runner_->PostTaskAndReplyWithResult(
+      FROM_HERE,
+      base::BindOnce(&HistoryBackend::GetKnownToSyncCount, history_backend_),
+      std::move(callback));
+}
+
+}  // namespace history
diff --git a/chromium_src/components/history/core/browser/history_service.h b/chromium_src/components/history/core/browser/history_service.h
@@ -15,8 +15,15 @@ class BraveHistoryQuickProviderTest;
   friend class ::BraveHistoryQuickProviderTest; \
   void CleanupUnused
 
+#define AddRelatedSearchesForVisit                                     \
+  GetKnownToSyncCount(                                                 \
+      base::OnceCallback<void(history::HistoryCountResult)> callback); \
+  void AddRelatedSearchesForVisit
+
 #include "src/components/history/core/browser/history_service.h"  // IWYU pragma: export
 
+#undef AddRelatedSearchesForVisit
+
 #undef Cleanup
 
 #endif  // BRAVE_CHROMIUM_SRC_COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_SERVICE_H_
diff --git a/chromium_src/components/history/core/browser/visit_database.cc b/chromium_src/components/history/core/browser/visit_database.cc
@@ -13,3 +13,21 @@
 #include "src/components/history/core/browser/visit_database.cc"
 
 #undef SOURCE_SAFARI_IMPORTED
+
+namespace history {
+
+bool VisitDatabase::GetKnownToSyncCount(int* count) {
+  sql::Statement statement(
+      GetDB().GetCachedStatement(SQL_FROM_HERE,
+                                 "SELECT COUNT(*) "
+                                 "FROM visits "
+                                 "WHERE is_known_to_sync == TRUE"));
+
+  *count = 0;
+  if (statement.Step()) {
+    *count = statement.ColumnInt(0);
+  }
+  return true;
+}
+
+}  // namespace history
diff --git a/chromium_src/components/history/core/browser/visit_database.h b/chromium_src/components/history/core/browser/visit_database.h
@@ -0,0 +1,17 @@
+/* Copyright (c) 2024 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_HISTORY_CORE_BROWSER_VISIT_DATABASE_H_
+#define BRAVE_CHROMIUM_SRC_COMPONENTS_HISTORY_CORE_BROWSER_VISIT_DATABASE_H_
+
+#define GetHistoryCount            \
+  GetKnownToSyncCount(int* count); \
+  bool GetHistoryCount
+
+#include "src/components/history/core/browser/visit_database.h"  // IWYU pragma: export
+
+#undef GetHistoryCount
+
+#endif  // BRAVE_CHROMIUM_SRC_COMPONENTS_HISTORY_CORE_BROWSER_VISIT_DATABASE_H_
diff --git a/chromium_src/ios/chrome/browser/sync/model/sync_service_factory.mm b/chromium_src/ios/chrome/browser/sync/model/sync_service_factory.mm
@@ -5,13 +5,16 @@
 
 #include "brave/browser/sync/brave_sync_service_impl_delegate.h"
 #include "brave/components/sync/service/brave_sync_service_impl.h"
+#include "ios/chrome/browser/history/model/history_service_factory.h"
 #include "ios/chrome/browser/sync/model/device_info_sync_service_factory.h"
 
-#define BRAVE_BUILD_SERVICE_INSTANCE_FOR                      \
-  std::make_unique<syncer::BraveSyncServiceImpl>(             \
-      std::move(init_params),                                 \
-      std::make_unique<syncer::BraveSyncServiceImplDelegate>( \
-          DeviceInfoSyncServiceFactory::GetForBrowserState(browser_state)));
+#define BRAVE_BUILD_SERVICE_INSTANCE_FOR                                   \
+  std::make_unique<syncer::BraveSyncServiceImpl>(                          \
+      std::move(init_params),                                              \
+      std::make_unique<syncer::BraveSyncServiceImplDelegate>(              \
+          DeviceInfoSyncServiceFactory::GetForBrowserState(browser_state), \
+          ios::HistoryServiceFactory::GetForBrowserState(                  \
+              browser_state, ServiceAccessType::IMPLICIT_ACCESS)));
 
 #include "src/ios/chrome/browser/sync/model/sync_service_factory.mm"
 

diff --git a/components/brave_sync/brave_sync_p3a.cc b/components/brave_sync/brave_sync_p3a.cc
@@ -46,12 +46,12 @@ void RecordEnabledTypes(bool sync_everything_enabled,
 }
 
 void RecordSyncedObjectsCount(int total_entities) {
-  // "Brave.Sync.SyncedObjectsCount"
+  // "Brave.Sync.SyncedObjectsCount.2"
   // 0 - 0..1000
   // 1 - 1001..10000
   // 2 - 10001..49000
   // 3 - >= 49001
-  p3a_utils::RecordToHistogramBucket(kSyncedObjectsCountHistogramName,
+  p3a_utils::RecordToHistogramBucket(kSyncedObjectsCountHistogramNameV2,
                                      {1000, 10000, 49000}, total_entities);
 }
 

diff --git a/components/brave_sync/brave_sync_p3a.h b/components/brave_sync/brave_sync_p3a.h
@@ -14,8 +14,9 @@ namespace p3a {
 // TODO(alexeybarabash): move here also "Brave.Sync.Status.2" and
 // "Brave.Sync.ProgressTokenEverReset"
 inline constexpr char kEnabledTypesHistogramName[] = "Brave.Sync.EnabledTypes";
-inline constexpr char kSyncedObjectsCountHistogramName[] =
-    "Brave.Sync.SyncedObjectsCount";
+// Improved version of metric which includes count of synced History objects
+inline constexpr char kSyncedObjectsCountHistogramNameV2[] =
+    "Brave.Sync.SyncedObjectsCount.2";
 
 enum class EnabledTypesAnswer {
   kEmptyOrBookmarksOnly = 0,

diff --git a/components/brave_sync/brave_sync_p3a_unittest.cc b/components/brave_sync/brave_sync_p3a_unittest.cc
@@ -58,22 +58,22 @@ TEST(BraveSyncP3ATest, TestSyncedObjectsCount) {
   base::HistogramTester histogram_tester;
 
   RecordSyncedObjectsCount(0);
-  histogram_tester.ExpectBucketCount(kSyncedObjectsCountHistogramName, 0, 1);
+  histogram_tester.ExpectBucketCount(kSyncedObjectsCountHistogramNameV2, 0, 1);
   RecordSyncedObjectsCount(1000);
-  histogram_tester.ExpectBucketCount(kSyncedObjectsCountHistogramName, 0, 2);
+  histogram_tester.ExpectBucketCount(kSyncedObjectsCountHistogramNameV2, 0, 2);
 
   RecordSyncedObjectsCount(1001);
-  histogram_tester.ExpectBucketCount(kSyncedObjectsCountHistogramName, 1, 1);
+  histogram_tester.ExpectBucketCount(kSyncedObjectsCountHistogramNameV2, 1, 1);
   RecordSyncedObjectsCount(10000);
-  histogram_tester.ExpectBucketCount(kSyncedObjectsCountHistogramName, 1, 2);
+  histogram_tester.ExpectBucketCount(kSyncedObjectsCountHistogramNameV2, 1, 2);
 
   RecordSyncedObjectsCount(10001);
-  histogram_tester.ExpectBucketCount(kSyncedObjectsCountHistogramName, 2, 1);
+  histogram_tester.ExpectBucketCount(kSyncedObjectsCountHistogramNameV2, 2, 1);
   RecordSyncedObjectsCount(49000);
-  histogram_tester.ExpectBucketCount(kSyncedObjectsCountHistogramName, 2, 2);
+  histogram_tester.ExpectBucketCount(kSyncedObjectsCountHistogramNameV2, 2, 2);
 
   RecordSyncedObjectsCount(49001);
-  histogram_tester.ExpectBucketCount(kSyncedObjectsCountHistogramName, 3, 1);
+  histogram_tester.ExpectBucketCount(kSyncedObjectsCountHistogramNameV2, 3, 1);
 }
 
 }  // namespace p3a

diff --git a/components/history/core/browser/BUILD.gn b/components/history/core/browser/BUILD.gn
@@ -0,0 +1,16 @@
+# Copyright (c) 2024 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at https://mozilla.org/MPL/2.0/.
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "//brave/components/history/core/browser/brave_visit_database_unittest.cc",
+  ]
+  deps = [
+    "//base",
+    "//components/history/core/browser",
+    "//testing/gtest",
+  ]
+}