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

Unified Diff: chrome/browser/profiles/profile_dependency_manager_unittest.cc

Issue 6803012: Profile shouldn't own DesktopNotificationService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix dependency manager unit test Created 9 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/profile_dependency_manager_unittest.cc
diff --git a/chrome/browser/profiles/profile_dependency_manager_unittest.cc b/chrome/browser/profiles/profile_dependency_manager_unittest.cc
index c50de50e4d17de484092361791b65da91a44f5ee..3b999634257b921b99bf5ac76b1c6c58d26b7f56 100644
--- a/chrome/browser/profiles/profile_dependency_manager_unittest.cc
+++ b/chrome/browser/profiles/profile_dependency_manager_unittest.cc
@@ -6,7 +6,6 @@
#include "chrome/browser/profiles/profile_dependency_manager.h"
#include "chrome/browser/profiles/profile_keyed_service_factory.h"
-#include "chrome/test/testing_profile.h"
class ProfileDependencyManagerUnittests : public ::testing::Test {
protected:
@@ -22,11 +21,6 @@ class ProfileDependencyManagerUnittests : public ::testing::Test {
child->DependsOn(parent);
}
- void CreateAndDestroyTestProfile() {
- TestingProfile profile;
- profile.SetProfileDependencyManager(&dependency_manager_);
- }
-
ProfileDependencyManager* manager() { return &dependency_manager_; }
std::vector<std::string>* shutdown_order() { return &shutdown_order_; }
@@ -66,7 +60,7 @@ class TestService : public ProfileKeyedServiceFactory {
TEST_F(ProfileDependencyManagerUnittests, SingleCase) {
TestService service("service", shutdown_order(), manager());
- CreateAndDestroyTestProfile();
+ manager()->DestroyProfileServices(NULL);
ASSERT_EQ(1U, shutdown_order()->size());
EXPECT_STREQ("service", (*shutdown_order())[0].c_str());
@@ -78,7 +72,7 @@ TEST_F(ProfileDependencyManagerUnittests, SimpleDependency) {
TestService child("child", shutdown_order(), manager());
DependOn(&child, &parent);
- CreateAndDestroyTestProfile();
+ manager()->DestroyProfileServices(NULL);
ASSERT_EQ(2U, shutdown_order()->size());
EXPECT_STREQ("child", (*shutdown_order())[0].c_str());
@@ -93,7 +87,7 @@ TEST_F(ProfileDependencyManagerUnittests, TwoChildrenOneParent) {
DependOn(&child1, &parent);
DependOn(&child2, &parent);
- CreateAndDestroyTestProfile();
+ manager()->DestroyProfileServices(NULL);
ASSERT_EQ(3U, shutdown_order()->size());
EXPECT_STREQ("child2", (*shutdown_order())[0].c_str());
@@ -116,7 +110,7 @@ TEST_F(ProfileDependencyManagerUnittests, MConfiguration) {
TestService child_of_2("child_of_2", shutdown_order(), manager());
DependOn(&child_of_2, &parent2);
- CreateAndDestroyTestProfile();
+ manager()->DestroyProfileServices(NULL);
ASSERT_EQ(5U, shutdown_order()->size());
EXPECT_STREQ("child_of_2", (*shutdown_order())[0].c_str());
@@ -140,7 +134,7 @@ TEST_F(ProfileDependencyManagerUnittests, DiamondConfiguration) {
DependOn(&bottom, &middle_row_1);
DependOn(&bottom, &middle_row_2);
- CreateAndDestroyTestProfile();
+ manager()->DestroyProfileServices(NULL);
ASSERT_EQ(4U, shutdown_order()->size());
EXPECT_STREQ("bottom", (*shutdown_order())[0].c_str());
@@ -173,7 +167,7 @@ TEST_F(ProfileDependencyManagerUnittests, ComplexGraph) {
DependOn(&bottom, &specialized_service);
DependOn(&bottom, &other_intermediary);
- CreateAndDestroyTestProfile();
+ manager()->DestroyProfileServices(NULL);
ASSERT_EQ(6U, shutdown_order()->size());
EXPECT_STREQ("bottom", (*shutdown_order())[0].c_str());

Powered by Google App Engine
This is Rietveld 408576698