commit 1557900265ebfc22022841f80141ed01e1578548
author Steffen Meschkat <mesch@google.com> Mon Dec 10 18:30:27 2018 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Wed Dec 12 21:58:25 2018 +0000
tree 4147dec781420bcaf361cb2716495a117884a328
parent a6bba373133fdd13c89c45e01a36c3c57352f5e9

[sessionmgr] Remove ledger dashboard.

It is obsolete.

TESTED=build. There was no test, the dashboard was disabled for tests.

Change-Id: I85e4cf4dd9c0b27393d935cc169762da53e02d99

bin/sessionmgr/sessionmgr_impl.cc

diff --git a/bin/sessionmgr/sessionmgr_impl.cc b/bin/sessionmgr/sessionmgr_impl.cc
index 72e8998..12e2d08 100644
--- a/bin/sessionmgr/sessionmgr_impl.cc
+++ b/bin/sessionmgr/sessionmgr_impl.cc
@@ -72,9 +72,6 @@
 constexpr char kSessionShellComponentNamespace[] = "user-shell-namespace";
 constexpr char kSessionShellLinkName[] = "user-shell-link";
 
-constexpr char kLedgerDashboardUrl[] = "ledger_dashboard";
-constexpr char kLedgerDashboardEnvLabel[] = "ledger-dashboard";
-
 constexpr char kClipboardAgentUrl[] =
     "fuchsia-pkg://fuchsia.com/clipboard_agent#meta/clipboard_agent.cmx";
 
@@ -199,7 +196,6 @@
   InitializeUser(std::move(account), std::move(token_provider_factory),
                  std::move(agent_token_manager), std::move(user_context));
   InitializeLedger(std::move(ledger_token_manager));
-  InitializeLedgerDashboard();
   InitializeDeviceMap();
   InitializeMessageQueueManager();
   InitializeMaxwellAndModular(session_shell.url, std::move(story_shell));
@@ -350,41 +346,6 @@
   AtEnd(Reset(&ledger_client_));
 }
 
-void SessionmgrImpl::InitializeLedgerDashboard() {
-  if (options_.test)
-    return;
-  static const auto* const kEnvServices = new std::vector<std::string>{
-      fuchsia::ledger::internal::LedgerRepositoryDebug::Name_};
-  ledger_dashboard_environment_ = std::make_unique<Environment>(
-      user_environment_->environment(), std::string(kLedgerDashboardEnvLabel),
-      *kEnvServices, /* kill_on_oom = */ false);
-  AtEnd(Reset(&ledger_dashboard_environment_));
-
-  ledger_dashboard_environment_
-      ->AddService<fuchsia::ledger::internal::LedgerRepositoryDebug>(
-          [this](fidl::InterfaceRequest<
-                 fuchsia::ledger::internal::LedgerRepositoryDebug>
-                     request) {
-            if (ledger_repository_) {
-              ledger_repository_->GetLedgerRepositoryDebug(std::move(request));
-            }
-          });
-
-  fuchsia::modular::AppConfig ledger_dashboard_config;
-  ledger_dashboard_config.url = kLedgerDashboardUrl;
-
-  ledger_dashboard_app_ =
-      std::make_unique<AppClient<fuchsia::modular::Lifecycle>>(
-          ledger_dashboard_environment_->GetLauncher(),
-          std::move(ledger_dashboard_config));
-
-  AtEnd(Reset(&ledger_dashboard_app_));
-  AtEnd(
-      Teardown(kBasicTimeout, "LedgerDashboard", ledger_dashboard_app_.get()));
-
-  FXL_LOG(INFO) << "Starting Ledger dashboard " << kLedgerDashboardUrl;
-}
-
 void SessionmgrImpl::InitializeDeviceMap() {
   // fuchsia::modular::DeviceMap service
   const std::string device_id = LoadDeviceID(GetAccountId(account_));

bin/sessionmgr/sessionmgr_impl.h

diff --git a/bin/sessionmgr/sessionmgr_impl.h b/bin/sessionmgr/sessionmgr_impl.h
index 24a6526..c2a67f8 100644
--- a/bin/sessionmgr/sessionmgr_impl.h
+++ b/bin/sessionmgr/sessionmgr_impl.h
@@ -111,7 +111,6 @@
           user_context);
   void InitializeLedger(
       fidl::InterfaceHandle<fuchsia::auth::TokenManager> ledger_token_manager);
-  void InitializeLedgerDashboard();
   void InitializeDeviceMap();
   void InitializeClipboard();
   void InitializeMessageQueueManager();
@@ -288,10 +287,6 @@
   fidl::BindingSet<fuchsia::modular::Link, std::unique_ptr<LinkImpl>>
       session_shell_link_bindings_;
 
-  // For the Ledger Debug Dashboard
-  std::unique_ptr<Environment> ledger_dashboard_environment_;
-  std::unique_ptr<AppClient<fuchsia::modular::Lifecycle>> ledger_dashboard_app_;
-
   // Holds the actions scheduled by calls to the AtEnd() method.
   std::vector<std::function<void(std::function<void()>)>> at_end_;