Remove PerBrowser launcher, reland step 1 of 2

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

Index: chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
index dbcf723fea0d10d48cd71428f9d4b6e577d649b7..9242e45551af6c3d3666bc48c3b38884c6ec5a90 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
@@ -12,22 +12,19 @@
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h"
+#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h"
 #include "chrome/test/base/testing_profile.h"
 #include "ui/aura/root_window.h"
 
-class TestChromeLauncherControllerPerBrowser :
-    public ChromeLauncherControllerPerBrowser {
+class TestChromeLauncherController : public ChromeLauncherController {
  public:
-  TestChromeLauncherControllerPerBrowser(
-      Profile* profile, ash::LauncherModel* model)
-      : ChromeLauncherControllerPerBrowser(profile, model) {}
+  TestChromeLauncherController(Profile* profile, ash::LauncherModel* model)
+      : ChromeLauncherController(profile, model) {}
   virtual bool IsLoggedInAsGuest() OVERRIDE {
     return false;
   }
  private:
-  DISALLOW_COPY_AND_ASSIGN(TestChromeLauncherControllerPerBrowser);
+  DISALLOW_COPY_AND_ASSIGN(TestChromeLauncherController);
 };
 
 class LauncherContextMenuTest : public ash::test::AshTestBase {
@@ -43,8 +40,7 @@ class LauncherContextMenuTest : public ash::test::AshTestBase {
   virtual void SetUp() OVERRIDE {
     ash::test::AshTestBase::SetUp();
     controller_.reset(
-        new TestChromeLauncherControllerPerBrowser(profile(),
-                                                   &launcher_model_));
+        new TestChromeLauncherController(profile(), &launcher_model_));
   }
 
   virtual void TearDown() OVERRIDE {