arc: Use the new InstanceHolder for unittests

chrome/browser/ui/app_list/app_context_menu_unittest.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 <map>
 #include <string>
 #include <unordered_set>
 #include <vector>
 
 #include "base/macros.h"
@@ skipping 358 matching lines @@
   EXPECT_TRUE(menu->IsEnabledAt(2));
   EXPECT_FALSE(menu->IsItemCheckedAt(2));
   EXPECT_EQ(app_list::AppContextMenu::SHOW_APP_INFO, menu->GetCommandIdAt(3));
   EXPECT_TRUE(menu->IsEnabledAt(3));
   EXPECT_FALSE(menu->IsItemCheckedAt(3));
 
   // Test activate request.
   EXPECT_EQ(0u, arc_test.app_instance()->launch_requests().size());
 
   menu->ActivatedAt(0);
-  arc_test.app_instance()->WaitForIncomingMethodCall();
 
   const ScopedVector<arc::FakeAppInstance::Request>& launch_requests =
       arc_test.app_instance()->launch_requests();
   ASSERT_EQ(1u, launch_requests.size());
   EXPECT_TRUE(launch_requests[0]->IsForApp(app_info));
 
   controller()->SetAppOpen(app_id, true);
   // It is not expected that menu model is unchanged on GetContextMenuModel. Arc
   // app menu requires model to be recalculated.
   menu = item.GetContextMenuModel();
@@ skipping 77 matching lines @@
     EXPECT_EQ(-1, menu->GetCommandIdAt(3));  // separator
     EXPECT_EQ(app_list::AppContextMenu::UNINSTALL, menu->GetCommandIdAt(4));
     EXPECT_TRUE(menu->IsEnabledAt(4));
     EXPECT_FALSE(menu->IsItemCheckedAt(4));
     EXPECT_EQ(app_list::AppContextMenu::SHOW_APP_INFO, menu->GetCommandIdAt(5));
     EXPECT_TRUE(menu->IsEnabledAt(5));
     EXPECT_FALSE(menu->IsItemCheckedAt(5));
   }
 }
 #endif