Revert 221197 "Adds an integration test for uninstalling app lis..."

trunk/src/chrome/browser/ui/views/app_list/app_list_controller_win.cc

Index: trunk/src/chrome/browser/ui/views/app_list/app_list_controller_win.cc
===================================================================
--- trunk/src/chrome/browser/ui/views/app_list/app_list_controller_win.cc	(revision 221205)
+++ trunk/src/chrome/browser/ui/views/app_list/app_list_controller_win.cc	(working copy)
@@ -568,8 +568,6 @@
       window_icon_updated_(false) {
   }
 
-  app_list::AppListView* view() { return view_; }
-
   void Show() {
     view_->GetWidget()->Show();
     if (!window_icon_updated_) {
@@ -701,12 +699,6 @@
     return view_->GetWindow();
   }
 
-  app_list::AppListModel* GetGurrentModel() {
-    if (!view_)
-      return NULL;
-    return view_->view()->model();
-  }
-
   void OnSigninStatusChanged() {
     if (view_)
       view_->OnSigninStatusChanged();
@@ -798,7 +790,7 @@
 // TODO(tapted): Rename this class to AppListServiceWin and move entire file to
 // chrome/browser/ui/app_list/app_list_service_win.cc after removing
 // chrome/browser/ui/views dependency.
-class AppListController : public AppListServiceWin {
+class AppListController : public AppListServiceImpl {
  public:
   virtual ~AppListController();
 
@@ -828,9 +820,6 @@
   // AppListServiceImpl overrides:
   virtual void CreateShortcut() OVERRIDE;
 
-  // AppListServiceWin overrides:
-  virtual app_list::AppListModel* GetAppListModelForTesting() OVERRIDE;
-
  private:
   friend struct DefaultSingletonTraits<AppListController>;
 
@@ -950,10 +939,6 @@
   return new AppListControllerDelegateWin();
 }
 
-app_list::AppListModel* AppListController::GetAppListModelForTesting() {
-  return shower_->GetGurrentModel();
-}
-
 void AppListController::ShowForProfile(Profile* requested_profile) {
   DCHECK(requested_profile);
   if (requested_profile->IsManaged())