Moves management of transients out of Window

chrome/browser/ui/ash/launcher/chrome_launcher_controller_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.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 924 matching lines @@
     return CreateMultiUserProfile("user1");
   }
   virtual void DestroyProfile(TestingProfile* profile) OVERRIDE {
     // Delete the profile through our profile manager.
     ProfileToNameMap::iterator it = created_profiles_.find(profile);
     DCHECK(it != created_profiles_.end());
     profile_manager_->DeleteTestingProfile(it->second);
     created_profiles_.erase(it);
   }
 
+  virtual views::ViewsDelegate* CreateViewsDelegate() OVERRIDE {
+    return new TestViewsDelegateForAppTest;
+  }
+
  private:
   typedef std::map<Profile*, std::string> ProfileToNameMap;
   TestingProfileManager* profile_manager() { return profile_manager_.get(); }
 
   chromeos::FakeUserManager* GetFakeUserManager() {
     return static_cast<chromeos::FakeUserManager*>(
         chromeos::UserManager::Get());
   }
 
   scoped_ptr<TestingProfileManager> profile_manager_;
@@ skipping 1371 matching lines @@
       launcher_controller_.get(), item_browser, 0, NULL, true));
   EXPECT_TRUE(CheckMenuCreation(
       launcher_controller_.get(), item_gmail, 0, NULL, false));
 }
 
 // Check that V2 applications are creating items properly in the launcher when
 // instantiated by the current user.
 TEST_F(MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest,
        V2AppHandlingTwoUsers) {
   InitLauncherController();
-  // We need to create a dummy views delegate to be able to create a V2 app.
-  scoped_ptr<TestViewsDelegateForAppTest> views_delegate(
-      new TestViewsDelegateForAppTest());
   // Create a profile for our second user (will be destroyed by the framework).
   TestingProfile* profile2 = CreateMultiUserProfile("user2");
   // Check that there is a browser and a app launcher.
   EXPECT_EQ(2, model_->item_count());
 
   // Add a v2 app.
   V2App v2_app(profile(), extension1_);
   EXPECT_EQ(3, model_->item_count());
 
   // After switching users the item should go away.
   SwitchActiveUser(profile2->GetProfileName());
   EXPECT_EQ(2, model_->item_count());
 
   // And it should come back when switching back.
   SwitchActiveUser(profile()->GetProfileName());
   EXPECT_EQ(3, model_->item_count());
 }
 
 // Check that V2 applications are creating items properly in edge cases:
 // a background user creates a V2 app, gets active and inactive again and then
 // deletes the app.
 TEST_F(MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest,
        V2AppHandlingTwoUsersEdgeCases) {
   InitLauncherController();
-  // We need to create a dummy views delegate to be able to create a V2 app.
-  scoped_ptr<TestViewsDelegateForAppTest> views_delegate(
-      new TestViewsDelegateForAppTest());
   // Create a profile for our second user (will be destroyed by the framework).
   TestingProfile* profile2 = CreateMultiUserProfile("user2");
   // Check that there is a browser and a app launcher.
   EXPECT_EQ(2, model_->item_count());
 
   // Switch to an inactive user.
   SwitchActiveUser(profile2->GetProfileName());
   EXPECT_EQ(2, model_->item_count());
 
   // Add the v2 app to the inactive user and check that no item was added to
@@ skipping 341 matching lines @@
 
   EXPECT_EQ(1, app_icon_loader->fetch_count());
   ASSERT_EQ(initial_size + 1, model_->items().size());
   EXPECT_TRUE(launcher_controller_->IsAppPinned("1"));
   EXPECT_FALSE(launcher_controller_->IsAppPinned("0"));
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[app_index].type);
 
   launcher_controller_->UnpinAppWithID("1");
   ASSERT_EQ(initial_size, model_->items().size());
 }