Skip to content

Commit

Permalink
Move local storage module out of CrOS Chrome
Browse files Browse the repository at this point in the history
Local storage is removed completely from ChromeOS Chrome
(both Ash and LaCros): text section size decreases by 2.3MiB.

% size out_betty-pi-arc/Release/chrome out_betty-pi-arc/Release/chrome.old
text            filename
223208034       out_betty-pi-arc/Release/chrome
225561033       out_betty-pi-arc/Release/chrome.old

Size of the executable file decrease by 2.7MiB.

434473144       out_betty-pi-arc/Release/chrome
437140432       out_betty-pi-arc/Release/chrome.old

Note: in order to make inclusion of the Storage configuration-dependent,
we need to declare a new component; I made it of StorageSelector, and
since it refers to `messaging_layer`, it cannot remain in `components`.
So I moved it into `messaging_later` itself.

Tests that involve enqueue+upload are removed from
`report_client_unittest.cc`. Also removed test for disabled uploader,
since this feature no longer exists.

Tested manually on ChromeOS and Linux - events are uploaded just fine.

Bug: b/206974617
Change-Id: I2b38ffc35c64126f887f7f66a6901123430cb107
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4950715
Reviewed-by: Josh Hilke <jrhilke@google.com>
Commit-Queue: Josh Hilke <jrhilke@google.com>
Auto-Submit: Leonid Baraz <lbaraz@chromium.org>
Reviewed-by: Vignesh Shenvi <vshenvi@google.com>
Reviewed-by: Hong Xu <xuhong@google.com>
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1212805}
  • Loading branch information
Leonid Baraz authored and Chromium LUCI CQ committed Oct 20, 2023
1 parent b93f59e commit a1b8371
Show file tree
Hide file tree
Showing 20 changed files with 398 additions and 383 deletions.
15 changes: 9 additions & 6 deletions chrome/browser/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -2093,6 +2093,7 @@ static_library("browser") {
"//chrome/browser/persisted_state_db:persisted_state_db",
"//chrome/browser/policy:path_parser",
"//chrome/browser/policy/messaging_layer/proto:log_upload_event_proto",
"//chrome/browser/policy/messaging_layer/storage_selector",
"//chrome/browser/privacy_budget",
"//chrome/browser/profiles",
"//chrome/browser/profiles:profile",
Expand Down Expand Up @@ -2362,11 +2363,7 @@ static_library("browser") {
"//components/reporting/proto:status_proto",
"//components/reporting/proto:upload_tracker_proto",
"//components/reporting/resources:resource_manager",
"//components/reporting/storage:storage_configuration",
"//components/reporting/storage:storage_module",
"//components/reporting/storage:storage_module_interface",
"//components/reporting/storage:storage_uploader_interface",
"//components/reporting/storage_selector",
"//components/reporting/util:backoff_settings",
"//components/reporting/util:status",
"//components/reporting/util:status_macros",
Expand Down Expand Up @@ -2646,6 +2643,13 @@ static_library("browser") {
if (is_chromeos_ash) {
deps += [ "//chrome/browser/screen_ai:screen_ai_dlc_installer" ]
}

if (!is_chromeos) {
deps += [
"//components/reporting/storage:storage_configuration",
"//components/reporting/storage:storage_module",
]
}
}

if (enable_search_engine_choice) {
Expand Down Expand Up @@ -8308,8 +8312,7 @@ static_library("test_support") {
"//components/reporting/proto:record_proto",
"//components/reporting/proto:status_proto",
"//components/reporting/proto:upload_tracker_proto",
"//components/reporting/storage:storage_module",
"//components/reporting/storage_selector",
"//components/reporting/storage:storage_uploader_interface",
"//components/reporting/util:status",
"//components/reporting/util:status_macros",
"//components/reporting/util:task_runner_context",
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/ash/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3559,6 +3559,7 @@ source_set("ash") {
"//chrome/browser/image_decoder",
"//chrome/browser/policy/messaging_layer/proto:crd_event_proto",
"//chrome/browser/policy/messaging_layer/proto:log_upload_event_proto",
"//chrome/browser/policy/messaging_layer/storage_selector",
"//chrome/browser/profiles:profile",
"//chrome/browser/safe_browsing",
"//chrome/browser/support_tool:support_tool_proto",
Expand Down Expand Up @@ -3756,7 +3757,6 @@ source_set("ash") {
"//components/reporting/proto:record_constants",
"//components/reporting/proto:record_proto",
"//components/reporting/resources:resource_manager",
"//components/reporting/storage_selector",
"//components/services/app_service",
"//components/services/unzip/public/cpp",
"//components/session_manager:base",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "base/task/single_thread_task_runner.h"
#include "base/task/thread_pool.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/policy/messaging_layer/storage_selector/storage_selector.h"
#include "chrome/browser/policy/messaging_layer/upload/event_upload_size_controller.h"
#include "chrome/browser/policy/messaging_layer/upload/file_upload_impl.h"
#include "chrome/browser/policy/messaging_layer/upload/upload_client.h"
Expand All @@ -26,7 +27,6 @@
#include "components/reporting/proto/synced/interface.pb.h"
#include "components/reporting/proto/synced/status.pb.h"
#include "components/reporting/resources/resource_manager.h"
#include "components/reporting/storage_selector/storage_selector.h"
#include "components/reporting/util/status.h"
#include "components/reporting/util/statusor.h"
#include "dbus/bus.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
#include "base/threading/platform_thread.h"
#include "chrome/browser/policy/messaging_layer/storage_selector/storage_selector.h"
#include "chrome/browser/policy/messaging_layer/upload/network_condition_service.h"
#include "chrome/browser/policy/messaging_layer/upload/upload_client.h"
#include "chrome/browser/policy/messaging_layer/upload/upload_provider.h"
#include "chromeos/ash/components/dbus/services/cros_dbus_service.h"
#include "chromeos/dbus/missive/missive_client.h"
#include "components/reporting/proto/synced/record.pb.h"
#include "components/reporting/resources/resource_manager.h"
#include "components/reporting/storage_selector/storage_selector.h"
#include "dbus/exported_object.h"
#include "dbus/message.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,24 +197,5 @@ TEST_F(EncryptedReportingServiceProviderTest, SuccessfullyUploadsRecord) {

EXPECT_THAT(response.status().code(), Eq(::reporting::error::OK));
}

TEST_F(EncryptedReportingServiceProviderTest,
NoRecordUploadWhenUploaderDisabled) {
SetupForRequestUploadEncryptedRecord();

::reporting::UploadEncryptedRecordRequest request;
request.add_encrypted_record()->CheckTypeAndMergeFrom(record_);

// Disable uploader.
scoped_feature_list_.InitFromCommandLine("", "ProvideUploader");

::reporting::UploadEncryptedRecordResponse response;
CallRequestUploadEncryptedRecord(request, &response);
task_environment_.RunUntilIdle();

ASSERT_THAT(*test_env_.url_loader_factory()->pending_requests(),
testing::IsEmpty());
}

} // namespace
} // namespace ash

0 comments on commit a1b8371

Please sign in to comment.