Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(252)

Side by Side Diff: athena/activity/activity_manager_unittest.cc

Issue 544813002: Support V1 app (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /// Copyright 2014 The Chromium Authors. All rights reserved. 1 /// Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "athena/activity/activity_manager_impl.h" 5 #include "athena/activity/activity_manager_impl.h"
6 6
7 #include "athena/activity/public/activity.h" 7 #include "athena/activity/public/activity.h"
8 #include "athena/activity/public/activity_factory.h" 8 #include "athena/activity/public/activity_factory.h"
9 #include "athena/test/athena_test_base.h" 9 #include "athena/test/athena_test_base.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
11 11
12 namespace athena { 12 namespace athena {
13 13
14 typedef test::AthenaTestBase ActivityManagerTest; 14 typedef test::AthenaTestBase ActivityManagerTest;
15 15
16 TEST_F(ActivityManagerTest, Basic) { 16 TEST_F(ActivityManagerTest, Basic) {
17 ActivityManagerImpl* activity_manager = 17 ActivityManagerImpl* activity_manager =
18 static_cast<ActivityManagerImpl*>(ActivityManager::Get()); 18 static_cast<ActivityManagerImpl*>(ActivityManager::Get());
19 Activity* activity1 = athena::ActivityFactory::Get()->CreateWebActivity( 19 Activity* activity1 = athena::ActivityFactory::Get()->CreateWebActivity(
20 NULL, GURL()); 20 NULL, base::string16(), GURL());
21 activity_manager->AddActivity(activity1); 21 activity_manager->AddActivity(activity1);
22 EXPECT_EQ(1, activity_manager->num_activities()); 22 EXPECT_EQ(1, activity_manager->num_activities());
23 23
24 Activity* activity2 = 24 Activity* activity2 = athena::ActivityFactory::Get()->CreateWebActivity(
25 athena::ActivityFactory::Get()->CreateWebActivity(NULL, GURL()); 25 NULL, base::string16(), GURL());
26 activity_manager->AddActivity(activity2); 26 activity_manager->AddActivity(activity2);
27 EXPECT_EQ(2, activity_manager->num_activities()); 27 EXPECT_EQ(2, activity_manager->num_activities());
28 28
29 Activity::Delete(activity1); 29 Activity::Delete(activity1);
30 EXPECT_EQ(1, activity_manager->num_activities()); 30 EXPECT_EQ(1, activity_manager->num_activities());
31 31
32 // Deleting the activity's window should delete the activity itself. 32 // Deleting the activity's window should delete the activity itself.
33 delete activity2->GetWindow(); 33 delete activity2->GetWindow();
34 EXPECT_EQ(0, activity_manager->num_activities()); 34 EXPECT_EQ(0, activity_manager->num_activities());
35 } 35 }
36 36
37 } // namespace athena 37 } // namespace athena
OLDNEW
« no previous file with comments | « no previous file | athena/activity/public/activity_factory.h » ('j') | athena/content/web_activity.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698