chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc - Issue 2557513004: Remove explicit singletonness of ArcBridgeService part 3.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc

Issue 2557513004: Remove explicit singletonness of ArcBridgeService part 3. (Closed)

Patch Set: Address comments. Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/arc/arc_session_manager_unittest.cc ('k') | chrome/browser/chromeos/policy/device_status_collector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc

diff --git a/chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc b/chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc

index 0611d93dc6ec733161ccb43dac09a767a857c25e..07ef5112d400163c7a647ba5659192cd81187cde 100644

--- a/chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc

+++ b/chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc

@@ -218,12 +218,17 @@ class ArcSettingsServiceTest : public InProcessBrowserTest {

SetupNetworkEnvironment();

RunUntilIdle();

- ArcBridgeService::Get()->intent_helper()->SetInstance(

- fake_intent_helper_instance_.get());

+ ArcServiceManager::Get()

+ ->arc_bridge_service()

+ ->intent_helper()

+ ->SetInstance(fake_intent_helper_instance_.get());

}

void TearDownOnMainThread() override {

- ArcBridgeService::Get()->intent_helper()->SetInstance(nullptr);

+ ArcServiceManager::Get()

+ ->arc_bridge_service()

+ ->intent_helper()

+ ->SetInstance(nullptr);

}

void UpdatePolicy(const policy::PolicyMap& policy) {