chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc - Issue 2596273002: Move ArcSessionRunner from ArcBridgeService to ArcSessionManager.

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/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc

Issue 2596273002: Move ArcSessionRunner from ArcBridgeService to ArcSessionManager. (Closed)

Patch Set: Rebase and update 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/ui/app_list/arc/arc_app_test.cc ('k') | chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc

diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc

index c11611a6ece83073a81e9bff1c10cd96b17a1010..49efa1ffc33c7794a7e8467a768230b69c7b41fd 100644

--- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc

+++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc

@@ -15,7 +15,6 @@

#if defined(OS_CHROMEOS)

#include "base/memory/ptr_util.h"

#include "chrome/browser/chromeos/arc/arc_session_manager.h"

-#include "components/arc/arc_bridge_service.h"

#include "components/arc/arc_session_runner.h"

#include "components/arc/test/fake_arc_session.h"

#endif

@@ -36,12 +35,9 @@ class AppInfoDialogAshTest : public ash::test::AshTestBase {

ash::test::AshTestBase::SetUp();

#if defined(OS_CHROMEOS)

arc::ArcSessionManager::DisableUIForTesting();

- bridge_service_ = base::MakeUnique<arc::ArcBridgeService>();

- bridge_service_->InitializeArcSessionRunner(

+ arc_session_manager_ = base::MakeUnique<arc::ArcSessionManager>(

base::MakeUnique<arc::ArcSessionRunner>(

base::Bind(arc::FakeArcSession::Create)));

- arc_session_manager_ =

- base::MakeUnique<arc::ArcSessionManager>(bridge_service_.get());

arc_session_manager_->OnPrimaryUserProfilePrepared(

extension_environment_.profile());

#endif

@@ -68,7 +64,6 @@ class AppInfoDialogAshTest : public ash::test::AshTestBase {

views::Widget* widget_ = nullptr;

AppInfoDialog* dialog_ = nullptr; // Owned by |widget_|'s views hierarchy.

#if defined(OS_CHROMEOS)

- std::unique_ptr<arc::ArcBridgeService> bridge_service_;

std::unique_ptr<arc::ArcSessionManager> arc_session_manager_;

#endif