Make a return value more generic
Bug: b/341806620
Change-Id: Ia8e8949fbe2dfae44c54f705867eaa9d6fc79cb9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5560393
Reviewed-by: Orin Jaworski <orinj@chromium.org>
Commit-Queue: Orin Jaworski <orinj@chromium.org>
Commit-Queue: Ilya Sherman <isherman@chromium.org>
Reviewed-by: Robert Ogden <robertogden@chromium.org>
Auto-Submit: Ilya Sherman <isherman@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1304750}
diff --git a/chrome/browser/history_embeddings/chrome_history_embeddings_service.cc b/chrome/browser/history_embeddings/chrome_history_embeddings_service.cc
index 98cf8b9f..ab23681 100644
--- a/chrome/browser/history_embeddings/chrome_history_embeddings_service.cc
+++ b/chrome/browser/history_embeddings/chrome_history_embeddings_service.cc
@@ -36,8 +36,8 @@
return nullptr;
}
- optimization_guide::ChromeModelQualityLogsUploaderService* quality_uploader =
- optimization_guide_service_->GetChromeModelQualityLogsUploaderService();
+ auto* quality_uploader =
+ optimization_guide_service_->GetModelQualityLogsUploaderService();
if (!quality_uploader) {
return nullptr;
}
diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.h b/chrome/browser/optimization_guide/optimization_guide_keyed_service.h
index 4b78e0a..a4d2328 100644
--- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.h
+++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.h
@@ -44,6 +44,7 @@
class ModelExecutionManager;
class ModelInfo;
class ModelQualityLogEntry;
+class ModelQualityLogsUploaderService;
class ModelValidatorKeyedService;
class OnDeviceModelComponentStateManager;
class OptimizationGuideStore;
@@ -55,7 +56,6 @@
class PushNotificationManager;
class TabUrlProvider;
class TopHostProvider;
-class ChromeModelQualityLogsUploaderService;
#if BUILDFLAG(IS_ANDROID)
namespace android {
@@ -192,8 +192,8 @@
return optimization_guide_logger_.get();
}
- optimization_guide::ChromeModelQualityLogsUploaderService*
- GetChromeModelQualityLogsUploaderService() {
+ optimization_guide::ModelQualityLogsUploaderService*
+ GetModelQualityLogsUploaderService() {
return model_quality_logs_uploader_service_.get();
}
@@ -319,7 +319,7 @@
// Manages the model quality logs uploader service. Not created for off the
// record profiles.
- std::unique_ptr<optimization_guide::ChromeModelQualityLogsUploaderService>
+ std::unique_ptr<optimization_guide::ModelQualityLogsUploaderService>
model_quality_logs_uploader_service_;
#if BUILDFLAG(IS_ANDROID)
diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service_browsertest.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service_browsertest.cc
index 345f139..27751b9 100644
--- a/chrome/browser/optimization_guide/optimization_guide_keyed_service_browsertest.cc
+++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service_browsertest.cc
@@ -360,7 +360,7 @@
return std::make_unique<ModelQualityLogEntry>(
std::move(log_ai_data_request),
- service()->GetChromeModelQualityLogsUploaderService()->GetWeakPtr());
+ service()->GetModelQualityLogsUploaderService()->GetWeakPtr());
}
GURL url_with_hints() { return url_with_hints_; }
@@ -1430,7 +1430,7 @@
ASSERT_FALSE(
g_browser_process->GetMetricsServicesManager()->IsMetricsConsentGiven());
- EXPECT_FALSE(ogks->GetChromeModelQualityLogsUploaderService()->CanUploadLogs(
+ EXPECT_FALSE(ogks->GetModelQualityLogsUploaderService()->CanUploadLogs(
UserVisibleFeatureKey::kCompose));
// Upload should be disabled as there is no metrics consent, so total
@@ -1546,7 +1546,7 @@
EXPECT_TRUE(model_execution_features_controller()
->ShouldFeatureBeCurrentlyAllowedForLogging(compose_feature));
- EXPECT_TRUE(ogks->GetChromeModelQualityLogsUploaderService()->CanUploadLogs(
+ EXPECT_TRUE(ogks->GetModelQualityLogsUploaderService()->CanUploadLogs(
UserVisibleFeatureKey::kCompose));
// Create a new ModelQualityLogEntry and pass it to the
@@ -1597,7 +1597,7 @@
model_execution_features_controller()
->ShouldFeatureBeCurrentlyAllowedForLogging(compose_feature));
- EXPECT_FALSE(ogks->GetChromeModelQualityLogsUploaderService()->CanUploadLogs(
+ EXPECT_FALSE(ogks->GetModelQualityLogsUploaderService()->CanUploadLogs(
UserVisibleFeatureKey::kCompose));
// Disable logging via via the enterprise policy to kDisable state this should
@@ -1616,7 +1616,7 @@
model_execution_features_controller()
->ShouldFeatureBeCurrentlyAllowedForLogging(compose_feature));
- EXPECT_FALSE(ogks->GetChromeModelQualityLogsUploaderService()->CanUploadLogs(
+ EXPECT_FALSE(ogks->GetModelQualityLogsUploaderService()->CanUploadLogs(
UserVisibleFeatureKey::kCompose));
// Enable logging via via the enterprise policy to state kAllow this shouldn't
@@ -1636,7 +1636,7 @@
EXPECT_TRUE(model_execution_features_controller()
->ShouldFeatureBeCurrentlyAllowedForLogging(compose_feature));
- EXPECT_TRUE(ogks->GetChromeModelQualityLogsUploaderService()->CanUploadLogs(
+ EXPECT_TRUE(ogks->GetModelQualityLogsUploaderService()->CanUploadLogs(
UserVisibleFeatureKey::kCompose));
// Upload should be disabled twice when logging is disabled via enterprise
@@ -1782,7 +1782,7 @@
EXPECT_TRUE(model_execution_features_controller()
->ShouldFeatureBeCurrentlyAllowedForLogging(compose_feature));
- EXPECT_TRUE(ogks->GetChromeModelQualityLogsUploaderService()->CanUploadLogs(
+ EXPECT_TRUE(ogks->GetModelQualityLogsUploaderService()->CanUploadLogs(
UserVisibleFeatureKey::kCompose));
// Intercept network requests.
