arc: Fix duplicate icons in app launcher in case of crash.

chrome/browser/ui/app_list/arc/arc_app_test.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_test.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
@@ skipping 23 matching lines @@
 }
 
 // static
 std::string ArcAppTest::GetAppId(const arc::mojom::ShortcutInfo& shortcut) {
   return ArcAppListPrefs::GetAppId(shortcut.package_name, shortcut.intent_uri);
 }
 
 ArcAppTest::ArcAppTest() {
   user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(
       new chromeos::FakeChromeUserManager()));
+  CreateFakeAppsAndPackages();
 }
 
 ArcAppTest::~ArcAppTest() {
 }
 
 chromeos::FakeChromeUserManager* ArcAppTest::GetUserManager() {
   return static_cast<chromeos::FakeChromeUserManager*>(
       user_manager::UserManager::Get());
 }
 
 void ArcAppTest::SetUp(Profile* profile) {
   if (!chromeos::DBusThreadManager::IsInitialized()) {
     chromeos::DBusThreadManager::Initialize();
     dbus_thread_manager_initialized_ = true;
   }
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       chromeos::switches::kEnableArc);
   DCHECK(!profile_);
   profile_ = profile;
   const user_manager::User* user = CreateUserAndLogin();
 
   // If for any reason the garbage collector kicks in while we are waiting for
   // an icon, have the user-to-profile mapping ready to avoid using the real
   // profile manager (which is null).
   chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
                                                                     profile_);
+
+  // A valid |arc_app_list_prefs_| is needed for the Arc bridge service and the
+  // Arc auth service.
+  arc_app_list_pref_ = ArcAppListPrefs::Get(profile_);
+  if (!arc_app_list_pref_) {
+    ArcAppListPrefsFactory::GetInstance()->RecreateServiceInstanceForTesting(
+        profile_);
+  }
+  bridge_service_.reset(new arc::FakeArcBridgeService());
+
+  arc_session_manager_.reset(new arc::ArcSessionManager(bridge_service_.get()));
+  DCHECK(arc::ArcSessionManager::Get());
+  arc::ArcSessionManager::DisableUIForTesting();
+  arc_session_manager_->OnPrimaryUserProfilePrepared(profile_);
+
+  arc_app_list_pref_ = ArcAppListPrefs::Get(profile_);
+  DCHECK(arc_app_list_pref_);
+  base::RunLoop run_loop;
+  arc_app_list_pref_->SetDefaltAppsReadyCallback(run_loop.QuitClosure());
+  run_loop.Run();
+
+  arc_session_manager_->EnableArc();
+  app_instance_.reset(new arc::FakeAppInstance(arc_app_list_pref_));
+  bridge_service_->app()->SetInstance(app_instance_.get());
+
+  // Check initial conditions.
+  EXPECT_EQ(bridge_service_.get(), arc::ArcBridgeService::Get());
+  EXPECT_FALSE(arc::ArcBridgeService::Get()->ready());
+}
+
+void ArcAppTest::CreateFakeAppsAndPackages() {
   arc::mojom::AppInfo app;
   // Make sure we have enough data for test.
   for (int i = 0; i < 3; ++i) {
     app.name = base::StringPrintf("Fake App %d", i);
     app.package_name = base::StringPrintf("fake.app.%d", i);
     app.activity = base::StringPrintf("fake.app.%d.activity", i);
     app.sticky = false;
     fake_apps_.push_back(app);
   }
   fake_apps_[0].sticky = true;
@@ skipping 37 matching lines @@
   for (int i = 0; i < 3; ++i) {
     arc::mojom::ShortcutInfo shortcutInfo;
     shortcutInfo.name = base::StringPrintf("Fake Shortcut %d", i);
     shortcutInfo.package_name = base::StringPrintf("fake.shortcut.%d", i);
     shortcutInfo.intent_uri =
         base::StringPrintf("fake.shortcut.%d.intent_uri", i);
     shortcutInfo.icon_resource_id =
         base::StringPrintf("fake.shortcut.%d.icon_resource_id", i);
     fake_shortcuts_.push_back(shortcutInfo);
   }
-
-  // A valid |arc_app_list_prefs_| is needed for the Arc bridge service and the
-  // Arc auth service.
-  arc_app_list_pref_ = ArcAppListPrefs::Get(profile_);
-  if (!arc_app_list_pref_) {
-    ArcAppListPrefsFactory::GetInstance()->RecreateServiceInstanceForTesting(
-        profile_);
-  }
-  bridge_service_.reset(new arc::FakeArcBridgeService());
-
-  arc_session_manager_.reset(new arc::ArcSessionManager(bridge_service_.get()));
-  DCHECK(arc::ArcSessionManager::Get());
-  arc::ArcSessionManager::DisableUIForTesting();
-  arc_session_manager_->OnPrimaryUserProfilePrepared(profile_);
-
-  arc_app_list_pref_ = ArcAppListPrefs::Get(profile_);
-  DCHECK(arc_app_list_pref_);
-  base::RunLoop run_loop;
-  arc_app_list_pref_->SetDefaltAppsReadyCallback(run_loop.QuitClosure());
-  run_loop.Run();
-
-  arc_session_manager_->EnableArc();
-  app_instance_.reset(new arc::FakeAppInstance(arc_app_list_pref_));
-  bridge_service_->app()->SetInstance(app_instance_.get());
-
-  // Check initial conditions.
-  EXPECT_EQ(bridge_service_.get(), arc::ArcBridgeService::Get());
-  EXPECT_FALSE(arc::ArcBridgeService::Get()->ready());
 }
 
 void ArcAppTest::TearDown() {
   arc_session_manager_.reset();
   if (dbus_thread_manager_initialized_) {
     // DBusThreadManager may be initialized from other testing utility,
     // such as ash::test::AshTestHelper::SetUp(), so Shutdown() only when
     // it is initialized in ArcAppTest::SetUp().
     chromeos::DBusThreadManager::Shutdown();
     dbus_thread_manager_initialized_ = false;
   }
+  arc_session_manager_.reset();

[Luis Héctor Chávez, 2016/11/22 17:14:14]

This was already destroyed a few lines above.

[khmel, 2016/11/22 18:43:05]

Done.

+  app_instance_.reset();

[Luis Héctor Chávez, 2016/11/22 17:14:14]

You should try to delete stuff in the reverse order it was initialized. This
should be the first line in TearDown().

[khmel, 2016/11/22 18:43:05]

Done.

+  bridge_service_.reset();

[Luis Héctor Chávez, 2016/11/22 17:14:14]

And this should be the second line.

[khmel, 2016/11/22 18:43:05]

Done,
As I see this is third line, arc_session_manager_ is created before.

+  profile_ = nullptr;
 }
 
 void ArcAppTest::StopArcInstance() {
   bridge_service_->app()->SetInstance(nullptr);
 }
 
 void ArcAppTest::RestartArcInstance() {
   bridge_service_->app()->SetInstance(nullptr);
   app_instance_.reset(new arc::FakeAppInstance(arc_app_list_pref_));
   bridge_service_->app()->SetInstance(app_instance_.get());
@@ skipping 22 matching lines @@
   }
 }
 
 bool ArcAppTest::FindPackage(const arc::mojom::ArcPackageInfo& package) {
   for (auto fake_package : fake_packages_) {
     if (package.package_name == fake_package.package_name)
       return true;
   }
   return false;
 }