Revert "Made restarting the Engine remember the last entrypoint that was used. (#13264)" (#13287)

This reverts commit 9dd585c4.

shell/common/engine.cc

@@ -128,9 +128,6 @@ Engine::RunStatus Engine::Run(RunConfiguration configuration) {
     return RunStatus::Failure;
   }
 
-  last_entry_point_ = configuration.GetEntrypoint();
-  last_entry_point_library_ = configuration.GetEntrypointLibrary();
-
   auto isolate_launch_status =
       PrepareAndLaunchIsolate(std::move(configuration));
   if (isolate_launch_status == Engine::RunStatus::Failure) {
@@ -506,12 +503,4 @@ void Engine::HandleAssetPlatformMessage(fml::RefPtr<PlatformMessage> message) {
   response->CompleteEmpty();
 }
 
-const std::string& Engine::GetLastEntrypoint() const {
-  return last_entry_point_;
-}
-
-const std::string& Engine::GetLastEntrypointLibrary() const {
-  return last_entry_point_library_;
-}
-
 }  // namespace flutter

shell/common/engine.h

@@ -717,18 +717,6 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
   // |PointerDataDispatcher::Delegate|
   void ScheduleSecondaryVsyncCallback(fml::closure callback) override;
 
-  //----------------------------------------------------------------------------
-  /// @brief      Get the last Entrypoint that was used in the RunConfiguration
-  ///             when |Engine::Run| was called.
-  ///
-  const std::string& GetLastEntrypoint() const;
-
-  //----------------------------------------------------------------------------
-  /// @brief      Get the last Entrypoint Library that was used in the
-  ///             RunConfiguration when |Engine::Run| was called.
-  ///
-  const std::string& GetLastEntrypointLibrary() const;
-
  private:
   Engine::Delegate& delegate_;
   const Settings settings_;
@@ -740,8 +728,6 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
   // is destructed first.
   std::unique_ptr<PointerDataDispatcher> pointer_data_dispatcher_;
 
-  std::string last_entry_point_;
-  std::string last_entry_point_library_;
   std::string initial_route_;
   ViewportMetrics viewport_metrics_;
   std::shared_ptr<AssetManager> asset_manager_;

shell/common/shell.cc

@@ -545,10 +545,14 @@ fml::WeakPtr<Rasterizer> Shell::GetRasterizer() {
   return weak_rasterizer_;
 }
 
+// TODO(dnfield): Remove this when either Topaz is up to date or flutter_runner
+// is built out of this repo.
+#ifdef OS_FUCHSIA
 fml::WeakPtr<Engine> Shell::GetEngine() {
   FML_DCHECK(is_setup_);
   return weak_engine_;
 }
+#endif  // OS_FUCHSIA
 
 fml::WeakPtr<PlatformView> Shell::GetPlatformView() {
   FML_DCHECK(is_setup_);
@@ -1267,9 +1271,6 @@ bool Shell::OnServiceProtocolRunInView(
 
   RunConfiguration configuration(std::move(isolate_configuration));
 
-  configuration.SetEntrypointAndLibrary(engine_->GetLastEntrypoint(),
-                                        engine_->GetLastEntrypointLibrary());
-
   configuration.AddAssetResolver(
       std::make_unique<DirectoryAssetBundle>(fml::OpenDirectory(
           asset_directory_path.c_str(), false, fml::FilePermission::kRead)));

shell/common/shell.h

@@ -216,6 +216,9 @@ class Shell final : public PlatformView::Delegate,
   ///
   fml::WeakPtr<Rasterizer> GetRasterizer();
 
+// TODO(dnfield): Remove this when either Topaz is up to date or flutter_runner
+// is built out of this repo.
+#ifdef OS_FUCHSIA
   //------------------------------------------------------------------------------
   /// @brief      Engines may only be accessed on the UI thread. This method is
   ///             deprecated, and implementers should instead use other API
@@ -224,6 +227,7 @@ class Shell final : public PlatformView::Delegate,
   /// @return     A weak pointer to the engine.
   ///
   fml::WeakPtr<Engine> GetEngine();
+#endif  // OS_FUCHSIA
 
   //----------------------------------------------------------------------------
   /// @brief      Platform views may only be accessed on the platform task

shell/common/shell_unittests.cc

@@ -202,27 +202,6 @@ TEST_F(ShellTest, SecondaryIsolateBindingsAreSetupViaShellSettings) {
   ASSERT_FALSE(DartVMRef::IsInstanceRunning());
 }
 
-TEST_F(ShellTest, LastEntrypoint) {
-  ASSERT_FALSE(DartVMRef::IsInstanceRunning());
-  auto settings = CreateSettingsForFixture();
-  auto shell = CreateShell(settings);
-  ASSERT_TRUE(ValidateShell(shell.get()));
-
-  auto configuration = RunConfiguration::InferFromSettings(settings);
-  ASSERT_TRUE(configuration.IsValid());
-  std::string entry_point = "fixturesAreFunctionalMain";
-  configuration.SetEntrypoint(entry_point);
-
-  fml::AutoResetWaitableEvent main_latch;
-  AddNativeCallback(
-      "SayHiFromFixturesAreFunctionalMain",
-      CREATE_NATIVE_ENTRY([&main_latch](auto args) { main_latch.Signal(); }));
-
-  RunEngine(shell.get(), std::move(configuration));
-  main_latch.Wait();
-  EXPECT_EQ(entry_point, shell->GetEngine()->GetLastEntrypoint());
-}
-
 TEST(ShellTestNoFixture, EnableMirrorsIsWhitelisted) {
   if (DartVM::IsRunningPrecompiledCode()) {
     // This covers profile and release modes which use AOT (where this flag does