Remove explicit singletonness of ArcBridgeService part 3.

chrome/browser/ui/views/arc_app_dialog_view_browsertest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_list/arc/arc_app_dialog.h"
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs_factory.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/arc/arc_bridge_service.h"

[msw, 2016/12/06 17:49:32]

nit: remove if not needed

[hidehiko, 2016/12/06 19:11:28]

Done.

 #include "components/arc/common/app.mojom.h"
 #include "components/arc/test/fake_app_instance.h"
 #include "content/public/test/test_utils.h"
 
 namespace arc {
 
 class ArcAppUninstallDialogViewBrowserTest : public InProcessBrowserTest {
  public:
   ArcAppUninstallDialogViewBrowserTest() {}
 
   // InProcessBrowserTest:
   ~ArcAppUninstallDialogViewBrowserTest() override {}
 
   void SetUpAppInstance() {
     profile_ = browser()->profile();
 
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         chromeos::switches::kEnableArc);
 
     // A valid |arc_app_list_prefs_| is needed for the Arc bridge service and

[msw, 2016/12/06 17:49:32]

nit: update mention of Arc bridge service, if it's no longer relevant here.

[hidehiko, 2016/12/06 19:11:28]

Hmm... Good catch. Actually neither ArcBridgeService nor ArcSessionManager uses
ArcAppListPrefs directly...
I've just removed the confusing comment. We may need to revisit here, later,
though. Let me keep the code L42-L46 as is, in order to focus on the
ArcBridgeService::Get() removal in this CL.

     // the Arc session manager.
     arc_app_list_pref_ = ArcAppListPrefs::Get(profile_);
     if (!arc_app_list_pref_) {
       ArcAppListPrefsFactory::GetInstance()->RecreateServiceInstanceForTesting(
           profile_);
     }
 
-    DCHECK(ArcBridgeService::Get());
     ArcSessionManager* session_manager = ArcSessionManager::Get();
     DCHECK(session_manager);
     ArcSessionManager::DisableUIForTesting();
     session_manager->OnPrimaryUserProfilePrepared(profile_);
     session_manager->EnableArc();
 
     arc_app_list_pref_ = ArcAppListPrefs::Get(profile_);
     DCHECK(arc_app_list_pref_);
 
     base::RunLoop run_loop;
@@ skipping 115 matching lines @@
   content::RunAllPendingInMessageLoop();
 
   EXPECT_TRUE(CloseAppDialogViewAndConfirmForTest(true));
   content::RunAllPendingInMessageLoop();
   app_ids = arc_app_list_pref()->GetAppIds();
   EXPECT_EQ(app_ids.size(), 1u);
   controller->DismissView();
 }
 
 }  // namespace arc