arc: Fix crash activating Play Store in deferred mode.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

 // Copyright 2013 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/ash/launcher/chrome_launcher_controller_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 4153 matching lines @@
   std::string window_app_id("org.chromium.arc.1");
   CreateArcWindow(window_app_id);
   arc_test_.app_instance()->SendTaskCreated(1, arc_test_.fake_default_apps()[0],
                                             std::string());
 
   EXPECT_NE(ash::kInvalidShelfID,
             launcher_controller_->GetShelfIDForAppID(app_id));
   EXPECT_FALSE(launcher_controller_->GetArcDeferredLauncher()->HasApp(app_id));
 }
 
+TEST_P(ChromeLauncherControllerArcDefaultAppsTest, PlayStoreDeferredLaunch) {
+  // Add ARC host app to enable Play Store default app.
+  extension_service_->AddExtension(arc_support_host_.get());
+  arc_test_.SetUp(profile());
+  ArcAppListPrefs* const prefs = arc_test_.arc_app_list_prefs();
+  EXPECT_TRUE(prefs->IsRegistered(arc::kPlayStoreAppId));
+
+  InitLauncherController();
+  ChromeLauncherController::set_instance_for_test(launcher_controller_.get());

[msw, 2017/04/04 01:42:05]

This is not necessary

[khmel, 2017/04/04 16:52:26]

Done.

+
+  EnablePlayStore(true);
+
+  // Pin Play Store. It should be pinned but not registered for deferred launch.
+  launcher_controller_->PinAppWithID(arc::kPlayStoreAppId);
+  EXPECT_TRUE(launcher_controller_->IsAppPinned(arc::kPlayStoreAppId));
+  EXPECT_FALSE(launcher_controller_->GetArcDeferredLauncher()->HasApp(
+      arc::kPlayStoreAppId));
+
+  // Simulate click. This should register deferred controller.

[msw, 2017/04/04 01:42:05]

nit: explain what deferred controller you mean more clearly, use a class name?

[khmel, 2017/04/04 16:52:26]

Done.

+  LauncherItemController* item_controller =
+      launcher_controller_->GetLauncherItemController(
+          launcher_controller_->GetShelfIDForAppID(arc::kPlayStoreAppId));
+  EXPECT_TRUE(item_controller);
+  SelectItem(item_controller);
+  EXPECT_TRUE(launcher_controller_->IsAppPinned(arc::kPlayStoreAppId));
+  EXPECT_TRUE(launcher_controller_->GetArcDeferredLauncher()->HasApp(
+      arc::kPlayStoreAppId));
+}
+
 // Checks the case when several app items have the same ordinal position (which
 // is valid case).
 TEST_F(ChromeLauncherControllerImplTest, CheckPositionConflict) {
   InitLauncherController();
 
   extension_service_->AddExtension(extension1_.get());
   extension_service_->AddExtension(extension2_.get());
   extension_service_->AddExtension(extension3_.get());
 
   syncer::SyncChangeList sync_list;
@@ skipping 211 matching lines @@
   EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS,
             shelf_controller->auto_hide());
   EXPECT_EQ(2u, shelf_controller->auto_hide_change_count());
 
   PrefService* prefs = profile()->GetTestingPrefService();
   EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignmentLocal));
   EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignment));
   EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehaviorLocal));
   EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehavior));
 }