Skip to content

Commit

Permalink
Automatically annotate dangling ExperimentalAsh pointers [10/N]
Browse files Browse the repository at this point in the history
This patch is:
- Automated. See [automation] section.
- Not affecting users, only Chrome's CQ. See [no-op] section.

This is a split affecting:
- chrome/

Context:
--------
@bartekn is going to remove the `ExperimentalAsh` raw_ptr annotation.
This was a performance experiment to enable/disable MiraclePtr on a
subset of new pointers added for ChromeOS ash (non-lacros).

Before removing it, he needs to enable it by default in code. Enabling
MiraclePtr for them, causes the DanglingPointerDetector to be enforced.
To pass the CQ, we need to annotate pre-existing dangling pointer with
`DanglingUntriaged`. After enabling ExperimentalAsh feature, it won't be
allowed anymore for those pointers to become dangling.

Automation:
-----------
1. Enable the `PartitionAllocBackupRefPtrForAsh` feature flag.
2. Apply the 'annotator' CL: https://chromium-review.googlesource.com/c/chromium/src/+/4474553
3. Run all the gtests. See https://docs.google.com/document/d/1AMMERcqy0eafFWopUCHYsIKIKEp3J8DFxqW9UIbzIHo
4. Concatenate all the output_*, `filter`, `sort -nr`, `uniq`.
5. Run https://github.com/ArthurSonzogni/chrome-dangling-ptr-apply-edit
6. Run `git cl format`
7. Cherry-pick the patch created from (5)

no-op:
------
The DanglingPointerDetector is not enabled against users. It only
affects tests and chromium developers.

Cq-Include-Trybots: luci.chrome.try:chromeos-betty-pi-arc-chrome;luci.chrome.try:linux-chromeos-chrome
Bug: chromium:1441101
Change-Id: I448bf5a61d6ce0af07e75282105d8a7adf627174
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4790003
Owners-Override: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1185069}
  • Loading branch information
ArthurSonzogni authored and Chromium LUCI CQ committed Aug 18, 2023
1 parent 7465cd2 commit ebfd4c1
Show file tree
Hide file tree
Showing 76 changed files with 205 additions and 130 deletions.
2 changes: 1 addition & 1 deletion chrome/browser/apps/app_service/file_utils_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class FileUtilsTest : public ::testing::Test {
content::BrowserTaskEnvironment task_environment_;
std::unique_ptr<TestingProfileManager> profile_manager_;
base::ScopedTempDir scoped_temp_dir_;
raw_ptr<TestingProfile, ExperimentalAsh> profile_;
raw_ptr<TestingProfile, DanglingUntriaged | ExperimentalAsh> profile_;
};

TEST_F(FileUtilsTest, GetFileSystemURL) {
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/apps/app_service/intent_util_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ class IntentUtilsFileTest : public ::testing::Test {
private:
content::BrowserTaskEnvironment task_environment_;
std::unique_ptr<TestingProfileManager> profile_manager_;
raw_ptr<TestingProfile, ExperimentalAsh> profile_;
raw_ptr<TestingProfile, DanglingUntriaged | ExperimentalAsh> profile_;
};

class IntentUtilsFileSystemSchemeTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ class WebsiteMetricsBrowserTest : public InProcessBrowserTest {

protected:
#if BUILDFLAG(IS_CHROMEOS_ASH)
raw_ptr<AppPlatformMetricsService, ExperimentalAsh>
raw_ptr<AppPlatformMetricsService, DanglingUntriaged | ExperimentalAsh>
app_platform_metrics_service_ = nullptr;
#else
raw_ptr<WebsiteMetricsServiceLacros> website_metrics_service_ = nullptr;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,8 @@ class ArcAppsPublisherTest : public testing::Test {
ArcAppTest arc_test_;
std::unique_ptr<TestingProfile> profile_;
apps::AppServiceTest app_service_test_;
raw_ptr<arc::ArcIntentHelperBridge, ExperimentalAsh> intent_helper_;
raw_ptr<arc::ArcIntentHelperBridge, DanglingUntriaged | ExperimentalAsh>
intent_helper_;
std::unique_ptr<arc::FakeFileSystemInstance> file_system_instance_;
std::unique_ptr<arc::ArcFileSystemBridge> arc_file_system_bridge_;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ class CrostiniAppsTest : public testing::Test {
content::BrowserTaskEnvironment task_environment_;
std::unique_ptr<TestingProfile> profile_;
std::unique_ptr<crostini::CrostiniTestHelper> test_helper_;
raw_ptr<AppServiceProxy, ExperimentalAsh> app_service_proxy_ = nullptr;
raw_ptr<AppServiceProxy, DanglingUntriaged | ExperimentalAsh>
app_service_proxy_ = nullptr;
};

TEST_F(CrostiniAppsTest, AppReadinessUpdatesWhenCrostiniDisabled) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,15 @@ class PluginVmAppsTest : public testing::Test {
}
} dbus_clients_;

raw_ptr<AppServiceProxy, ExperimentalAsh> app_service_proxy_ = nullptr;
raw_ptr<AppServiceProxy, DanglingUntriaged | ExperimentalAsh>
app_service_proxy_ = nullptr;
content::BrowserTaskEnvironment task_environment_;
std::unique_ptr<TestingProfile> profile_;
std::unique_ptr<plugin_vm::PluginVmTestHelper> test_helper_;
raw_ptr<storage::ExternalMountPoints, ExperimentalAsh> mount_points_;
std::string mount_name_;
raw_ptr<MockPluginVmManager, ExperimentalAsh> plugin_vm_manager_;
raw_ptr<MockPluginVmManager, DanglingUntriaged | ExperimentalAsh>
plugin_vm_manager_;
};

TEST_F(PluginVmAppsTest, AppServiceHasPluginVmIntentFilters) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class CrOSComponentInstallerPolicy : public ComponentInstallerPolicy {
std::string GetName() const override;

protected:
const raw_ptr<CrOSComponentInstaller, ExperimentalAsh>
const raw_ptr<CrOSComponentInstaller, DanglingUntriaged | ExperimentalAsh>
cros_component_installer_;

private:
Expand Down
6 changes: 4 additions & 2 deletions chrome/browser/device_api/device_service_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@ class DeviceAPIServiceRegularUserTest : public DeviceAPIServiceTest {
}

private:
raw_ptr<user_manager::FakeUserManager, ExperimentalAsh> fake_user_manager_;
raw_ptr<user_manager::FakeUserManager, DanglingUntriaged | ExperimentalAsh>
fake_user_manager_;
user_manager::ScopedUserManager scoped_user_manager_;
};

Expand Down Expand Up @@ -205,7 +206,8 @@ class DeviceAPIServiceWithKioskUserTest : public DeviceAPIServiceTest {
ash::WebKioskAppManager* app_manager() const { return app_manager_.get(); }

private:
raw_ptr<ash::FakeChromeUserManager, ExperimentalAsh> fake_user_manager_;
raw_ptr<ash::FakeChromeUserManager, DanglingUntriaged | ExperimentalAsh>
fake_user_manager_;
user_manager::ScopedUserManager scoped_user_manager_;
std::unique_ptr<ash::WebKioskAppManager> app_manager_;
base::test::ScopedCommandLine command_line_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2904,10 +2904,11 @@ class DownloadTargetDeterminerDlpTest : public DownloadTargetDeterminerTest {
}

std::unique_ptr<TestingProfile> profile_;
raw_ptr<ash::FakeChromeUserManager, ExperimentalAsh> user_manager_;
raw_ptr<ash::FakeChromeUserManager, DanglingUntriaged | ExperimentalAsh>
user_manager_;
std::unique_ptr<user_manager::ScopedUserManager> scoped_user_manager_;
raw_ptr<policy::MockDlpRulesManager, ExperimentalAsh> rules_manager_ =
nullptr;
raw_ptr<policy::MockDlpRulesManager, DanglingUntriaged | ExperimentalAsh>
rules_manager_ = nullptr;
std::unique_ptr<MockFilesController> mock_files_controller_ = nullptr;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,9 @@ class MultiProfileDownloadNotifierTest : public BrowserWithTestWindowTest {
}

testing::NiceMock<MockNotifierClient> client_;
raw_ptr<testing::NiceMock<MockDownloadManager>, ExperimentalAsh> manager_;
raw_ptr<testing::NiceMock<MockDownloadManager>,
DanglingUntriaged | ExperimentalAsh>
manager_;
testing::NiceMock<download::MockDownloadItem> item_;
std::unique_ptr<MultiProfileDownloadNotifier> notifier_;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,11 @@ class AshAttestationServiceImplTest : public testing::Test {
content::BrowserTaskEnvironment task_environment_;

TestingProfile test_profile_;
raw_ptr<ash::attestation::MockTpmChallengeKeySubtle, ExperimentalAsh>
raw_ptr<ash::attestation::MockTpmChallengeKeySubtle,
DanglingUntriaged | ExperimentalAsh>
mock_challenge_key_subtle_;
raw_ptr<ash::attestation::MockTpmChallengeKey, ExperimentalAsh>
raw_ptr<ash::attestation::MockTpmChallengeKey,
DanglingUntriaged | ExperimentalAsh>
mock_challenge_key_;
std::set<enterprise_connectors::DTCPolicyLevel> levels_;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,9 @@ class AshSignalsDecoratorBrowserTest

std::unique_ptr<TestingProfile> testing_profile_;
TestingPrefServiceSimple prefs_;
raw_ptr<policy::BrowserPolicyConnectorAsh, ExperimentalAsh> connector_;
raw_ptr<policy::BrowserPolicyConnectorAsh,
DanglingUntriaged | ExperimentalAsh>
connector_;

ash::system::ScopedFakeStatisticsProvider fake_statistics_provider_;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ class BluetoothLowEnergyApiTestChromeOs : public PlatformAppBrowserTest {

ash::KioskAppManager* manager() const { return ash::KioskAppManager::Get(); }

raw_ptr<ash::FakeChromeUserManager, ExperimentalAsh> fake_user_manager_;
raw_ptr<ash::FakeChromeUserManager, DanglingUntriaged | ExperimentalAsh>
fake_user_manager_;
std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;

ash::ScopedCrosSettingsTestHelper settings_helper_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class CrashReportPrivateApiTest : public ExtensionApiTest {
const absl::optional<MockCrashEndpoint::Report>& last_report() {
return crash_endpoint_->last_report();
}
raw_ptr<const Extension, ExperimentalAsh> extension_;
raw_ptr<const Extension, DanglingUntriaged | ExperimentalAsh> extension_;
std::unique_ptr<MockCrashEndpoint> crash_endpoint_;
std::unique_ptr<ScopedMockChromeJsErrorReportProcessor> processor_;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,13 @@ class EPKChallengeKeyTestBase : public BrowserWithTestWindowTest {
scoped_refptr<const extensions::Extension> extension_;
ash::StubInstallAttributes stub_install_attributes_;
// fake_user_manager_ is owned by user_manager_enabler_.
raw_ptr<ash::FakeChromeUserManager, ExperimentalAsh> fake_user_manager_ =
nullptr;
raw_ptr<ash::FakeChromeUserManager, DanglingUntriaged | ExperimentalAsh>
fake_user_manager_ = nullptr;
user_manager::ScopedUserManager user_manager_enabler_;
ash::platform_keys::MockKeyPermissionsManager key_permissions_manager_;
raw_ptr<PrefService, ExperimentalAsh> prefs_ = nullptr;
raw_ptr<ash::attestation::MockTpmChallengeKey, ExperimentalAsh>
raw_ptr<PrefService, DanglingUntriaged | ExperimentalAsh> prefs_ = nullptr;
raw_ptr<ash::attestation::MockTpmChallengeKey,
DanglingUntriaged | ExperimentalAsh>
mock_tpm_challenge_key_ = nullptr;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ class EPKPChallengeKeyTestBase : public BrowserWithTestWindowTest {

scoped_refptr<const Extension> extension_;
// fake_user_manager_ is owned by user_manager_enabler_.
raw_ptr<ash::FakeChromeUserManager, ExperimentalAsh> fake_user_manager_ =
nullptr;
raw_ptr<ash::FakeChromeUserManager, DanglingUntriaged | ExperimentalAsh>
fake_user_manager_ = nullptr;
user_manager::ScopedUserManager user_manager_enabler_;
raw_ptr<PrefService, ExperimentalAsh> prefs_ = nullptr;
raw_ptr<PrefService, DanglingUntriaged | ExperimentalAsh> prefs_ = nullptr;
};

class EPKPChallengeMachineKeyTest : public EPKPChallengeKeyTestBase {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class FileSystemApiConsentProviderTest : public testing::Test {

protected:
std::unique_ptr<TestingPrefServiceSimple> testing_pref_service_;
raw_ptr<ash::FakeChromeUserManager, ExperimentalAsh>
raw_ptr<ash::FakeChromeUserManager, DanglingUntriaged | ExperimentalAsh>
user_manager_; // Owned by the scope enabler.
std::unique_ptr<user_manager::ScopedUserManager> scoped_user_manager_enabler_;
content::BrowserTaskEnvironment task_environment_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ class FileSystemApiTestForDrive : public PlatformAppBrowserTest {
base::ScopedTempDir drivefs_root_;
base::FilePath drivefs_mount_point_;
std::unique_ptr<drive::FakeDriveFsHelper> fake_drivefs_helper_;
raw_ptr<drive::DriveIntegrationService, ExperimentalAsh>
raw_ptr<drive::DriveIntegrationService, DanglingUntriaged | ExperimentalAsh>
integration_service_ = nullptr;
drive::DriveIntegrationServiceFactory::FactoryCallback
create_drive_integration_service_;
Expand Down Expand Up @@ -245,7 +245,8 @@ class FileSystemApiTestForRequestFileSystem : public PlatformAppBrowserTest {

protected:
base::ScopedTempDir temp_dir_;
raw_ptr<ash::FakeChromeUserManager, ExperimentalAsh> fake_user_manager_;
raw_ptr<ash::FakeChromeUserManager, DanglingUntriaged | ExperimentalAsh>
fake_user_manager_;
std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;

// Creates a testing file system in a testing directory.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class RemovableStorageProviderChromeOsUnitTest : public testing::Test {
}

content::BrowserTaskEnvironment task_environment_;
raw_ptr<ash::disks::MockDiskMountManager, ExperimentalAsh>
raw_ptr<ash::disks::MockDiskMountManager, DanglingUntriaged | ExperimentalAsh>
disk_mount_manager_mock_;
scoped_refptr<StorageDeviceList> devices_;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,8 @@ class QuickUnlockPrivateUnitTest
}

base::test::ScopedFeatureList feature_list_;
raw_ptr<sync_preferences::TestingPrefServiceSyncable, ExperimentalAsh>
raw_ptr<sync_preferences::TestingPrefServiceSyncable,
DanglingUntriaged | ExperimentalAsh>
test_pref_service_;

private:
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/extensions/external_policy_loader_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ class ExternalPolicyLoaderAshTest : public ExternalPolicyLoaderTest {
}

private:
raw_ptr<ash::FakeChromeUserManager, ExperimentalAsh> fake_user_manager_ =
nullptr;
raw_ptr<ash::FakeChromeUserManager, DanglingUntriaged | ExperimentalAsh>
fake_user_manager_ = nullptr;
std::unique_ptr<user_manager::ScopedUserManager> scoped_user_manager_;
};

Expand Down
6 changes: 4 additions & 2 deletions chrome/browser/extensions/external_pref_loader_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ class TestSyncService : public syncer::TestSyncService {
}

private:
raw_ptr<syncer::SyncServiceObserver, ExperimentalAsh> observer_ = nullptr;
raw_ptr<syncer::SyncServiceObserver, DanglingUntriaged | ExperimentalAsh>
observer_ = nullptr;
};

std::unique_ptr<KeyedService> TestingSyncFactoryFunction(
Expand Down Expand Up @@ -116,7 +117,8 @@ class ExternalPrefLoaderTest : public ::testing::Test {
private:
content::BrowserTaskEnvironment task_environment_;
std::unique_ptr<TestingProfile> profile_;
raw_ptr<TestSyncService, ExperimentalAsh> sync_service_ = nullptr;
raw_ptr<TestSyncService, DanglingUntriaged | ExperimentalAsh> sync_service_ =
nullptr;
};

// TODO(lazyboy): Add a test to cover
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ class ExternalProviderImplChromeOSTest : public ExtensionServiceTestBase {
private:
std::unique_ptr<base::ScopedPathOverride> external_externsions_overrides_;
ash::system::ScopedFakeStatisticsProvider fake_statistics_provider_;
raw_ptr<ash::FakeChromeUserManager, ExperimentalAsh> fake_user_manager_;
raw_ptr<ash::FakeChromeUserManager, DanglingUntriaged | ExperimentalAsh>
fake_user_manager_;
user_manager::ScopedUserManager scoped_user_manager_;
};

Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/extensions/update_install_gate_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,8 @@ class UpdateInstallGateTest : public testing::Test {

#if BUILDFLAG(IS_CHROMEOS_ASH)
// Needed for creating ExtensionService.
raw_ptr<ash::FakeChromeUserManager, ExperimentalAsh> fake_user_manager_ =
nullptr;
raw_ptr<ash::FakeChromeUserManager, DanglingUntriaged | ExperimentalAsh>
fake_user_manager_ = nullptr;
std::unique_ptr<user_manager::ScopedUserManager> scoped_user_manager_enabler_;
#endif

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -355,13 +355,15 @@ class ChromeMetricsServiceClientTestIgnoredForAppMetrics
base::test::ScopedFeatureList scoped_feature_list_;

std::vector<ukm::SourceId> source_ids_;
raw_ptr<ChromeMetricsServiceClient, ExperimentalAsh>
raw_ptr<ChromeMetricsServiceClient, DanglingUntriaged | ExperimentalAsh>
chrome_metrics_service_client_;

MockSyncService sync_service_;
ash::system::ScopedFakeStatisticsProvider fake_statistics_provider_;
raw_ptr<TestingProfile, ExperimentalAsh> testing_profile_ = nullptr;
raw_ptr<ash::multidevice_setup::FakeMultiDeviceSetupClient, ExperimentalAsh>
raw_ptr<TestingProfile, DanglingUntriaged | ExperimentalAsh>
testing_profile_ = nullptr;
raw_ptr<ash::multidevice_setup::FakeMultiDeviceSetupClient,
DanglingUntriaged | ExperimentalAsh>
fake_multidevice_setup_client_;
std::unique_ptr<FakeMultiDeviceSetupClientImplFactory>
fake_multidevice_setup_client_impl_factory_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,14 @@ class ChromeOSSystemProfileProviderTest : public testing::Test {
}

protected:
raw_ptr<ash::multidevice_setup::FakeMultiDeviceSetupClient, ExperimentalAsh>
raw_ptr<ash::multidevice_setup::FakeMultiDeviceSetupClient,
DanglingUntriaged | ExperimentalAsh>
fake_multidevice_setup_client_;
base::test::ScopedFeatureList scoped_feature_list_;
ash::system::ScopedFakeStatisticsProvider fake_statistics_provider_;
std::unique_ptr<TestingProfileManager> profile_manager_;
raw_ptr<TestingProfile, ExperimentalAsh> testing_profile_ = nullptr;
raw_ptr<TestingProfile, DanglingUntriaged | ExperimentalAsh>
testing_profile_ = nullptr;
std::unique_ptr<FakeMultiDeviceSetupClientImplFactory>
fake_multidevice_setup_client_impl_factory_;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ class FakeNearbyShareCertificateStorage : public NearbyShareCertificateStorage {
const base::FilePath& profile_path) override;

std::vector<FakeNearbyShareCertificateStorage*> instances_;
raw_ptr<PrefService, ExperimentalAsh> latest_pref_service_ = nullptr;
raw_ptr<PrefService, DanglingUntriaged | ExperimentalAsh>
latest_pref_service_ = nullptr;
raw_ptr<leveldb_proto::ProtoDatabaseProvider, ExperimentalAsh>
latest_proto_database_provider_ = nullptr;
base::FilePath latest_profile_path_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,9 @@ class NearbyShareCertificateManagerImplTest
}
}

raw_ptr<FakeNearbyShareCertificateStorage, ExperimentalAsh> cert_store_;
raw_ptr<FakeNearbyShareCertificateStorage,
DanglingUntriaged | ExperimentalAsh>
cert_store_;
raw_ptr<ash::nearby::FakeNearbyScheduler, DanglingUntriaged | ExperimentalAsh>
private_cert_exp_scheduler_;
raw_ptr<ash::nearby::FakeNearbyScheduler, DanglingUntriaged | ExperimentalAsh>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,8 @@ class NearbyShareClientFactoryImpl : public NearbyShareClientFactory {
std::unique_ptr<NearbyShareClient> CreateInstance() override;

private:
raw_ptr<signin::IdentityManager, ExperimentalAsh> identity_manager_;
raw_ptr<signin::IdentityManager, DanglingUntriaged | ExperimentalAsh>
identity_manager_;
const scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
raw_ptr<NearbyShareHttpNotifier, ExperimentalAsh> notifier_;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,8 @@ class NearbyShareClientImplTest : public testing::Test,
list_public_certificate_response_from_notifier_;
base::test::TaskEnvironment task_environment_;
signin::IdentityTestEnvironment identity_test_environment_;
raw_ptr<FakeNearbyShareApiCallFlow, ExperimentalAsh> api_call_flow_;
raw_ptr<FakeNearbyShareApiCallFlow, DanglingUntriaged | ExperimentalAsh>
api_call_flow_;
scoped_refptr<network::SharedURLLoaderFactory> shared_factory_;
NearbyShareHttpNotifier notifier_;
std::unique_ptr<NearbyShareClient> client_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,12 @@ class FakeNearbyShareContactManager : public NearbyShareContactManager {

std::vector<FakeNearbyShareContactManager*> instances_;
raw_ptr<PrefService, ExperimentalAsh> latest_pref_service_ = nullptr;
raw_ptr<NearbyShareClientFactory, ExperimentalAsh>
raw_ptr<NearbyShareClientFactory, DanglingUntriaged | ExperimentalAsh>
latest_http_client_factory_ = nullptr;
raw_ptr<NearbyShareLocalDeviceDataManager, ExperimentalAsh>
raw_ptr<NearbyShareLocalDeviceDataManager,
DanglingUntriaged | ExperimentalAsh>
latest_local_device_data_manager_ = nullptr;
raw_ptr<NearbyShareProfileInfoProvider, ExperimentalAsh>
raw_ptr<NearbyShareProfileInfoProvider, DanglingUntriaged | ExperimentalAsh>
latest_profile_info_provider_ = nullptr;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ class FakeNearbyShareLocalDeviceDataManager
private:
std::vector<FakeNearbyShareLocalDeviceDataManager*> instances_;
raw_ptr<PrefService, ExperimentalAsh> latest_pref_service_ = nullptr;
raw_ptr<NearbyShareClientFactory, ExperimentalAsh>
raw_ptr<NearbyShareClientFactory, DanglingUntriaged | ExperimentalAsh>
latest_http_client_factory_ = nullptr;
raw_ptr<NearbyShareProfileInfoProvider, ExperimentalAsh>
raw_ptr<NearbyShareProfileInfoProvider, DanglingUntriaged | ExperimentalAsh>
latest_profile_info_provider_ = nullptr;
};

Expand Down

0 comments on commit ebfd4c1

Please sign in to comment.