diff options
| author | skuhne <skuhne@chromium.org> | 2014-09-04 20:05:26 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-05 03:09:25 +0000 |
| commit | 2d350ffed31ecb2fa67d131585e50e1df2ca2d09 (patch) | |
| tree | 7858553fe8629512ee52325e0f9d15e953edf0d5 /athena/activity/activity_manager_unittest.cc | |
| parent | f59abe0ce199aac0cd2eccf32ad7975155dbeded (diff) | |
| download | chromium_src-2d350ffed31ecb2fa67d131585e50e1df2ca2d09.zip chromium_src-2d350ffed31ecb2fa67d131585e50e1df2ca2d09.tar.gz chromium_src-2d350ffed31ecb2fa67d131585e50e1df2ca2d09.tar.bz2 | |
Decoupling visibility states from webcontent, adding visibility management in ResourceManager
It works as desired. An abstract class to handle overview representations of unloaded WebContents has still to be added, but since the CL is already quite big as is, I split this up into a follow up CL.
BUG=408826, 408834
TEST=AppActivityTest.*, ResourceManager.* and visual
Review URL: https://codereview.chromium.org/536013002
Cr-Commit-Position: refs/heads/master@{#293414}
Diffstat (limited to 'athena/activity/activity_manager_unittest.cc')
| -rw-r--r-- | athena/activity/activity_manager_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/athena/activity/activity_manager_unittest.cc b/athena/activity/activity_manager_unittest.cc index 4374609..5c45c0b 100644 --- a/athena/activity/activity_manager_unittest.cc +++ b/athena/activity/activity_manager_unittest.cc @@ -16,9 +16,9 @@ typedef test::AthenaTestBase ActivityManagerTest; TEST_F(ActivityManagerTest, Basic) { ActivityManagerImpl* activity_manager = static_cast<ActivityManagerImpl*>(ActivityManager::Get()); - scoped_ptr<Activity> activity1( - athena::ActivityFactory::Get()->CreateWebActivity(NULL, GURL())); - activity_manager->AddActivity(activity1.get()); + Activity* activity1 = athena::ActivityFactory::Get()->CreateWebActivity( + NULL, GURL()); + activity_manager->AddActivity(activity1); EXPECT_EQ(1, activity_manager->num_activities()); Activity* activity2 = @@ -26,7 +26,7 @@ TEST_F(ActivityManagerTest, Basic) { activity_manager->AddActivity(activity2); EXPECT_EQ(2, activity_manager->num_activities()); - activity1.reset(); + Activity::Delete(activity1); EXPECT_EQ(1, activity_manager->num_activities()); // Deleting the activity's window should delete the activity itself. |