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

Unified Diff: chrome/browser/themes/theme_service_unittest.cc

Issue 318863008: Move ExtensionServiceTestBase into it's own header/cc file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge conflict Created 6 years, 6 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/themes/theme_service_unittest.cc
diff --git a/chrome/browser/themes/theme_service_unittest.cc b/chrome/browser/themes/theme_service_unittest.cc
index cbebc923b8ffacb585e4c69c416f58c8d0f6a7cf..c834234d66b38eb730e0411a62b9fd88370d0503 100644
--- a/chrome/browser/themes/theme_service_unittest.cc
+++ b/chrome/browser/themes/theme_service_unittest.cc
@@ -7,7 +7,8 @@
#include "base/file_util.h"
#include "base/path_service.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/extensions/extension_service_unittest.h"
+#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_service_test_base.h"
#include "chrome/browser/extensions/unpacked_installer.h"
#include "chrome/browser/managed_mode/managed_user_service.h"
#include "chrome/browser/managed_mode/managed_user_service_factory.h"
@@ -27,7 +28,7 @@ using extensions::ExtensionRegistry;
namespace theme_service_internal {
-class ThemeServiceTest : public ExtensionServiceTestBase {
+class ThemeServiceTest : public extensions::ExtensionServiceTestBase {
public:
ThemeServiceTest() : is_managed_(false),
registry_(NULL) {}
@@ -82,8 +83,8 @@ class ThemeServiceTest : public ExtensionServiceTestBase {
}
virtual void SetUp() {
- ExtensionServiceTestBase::SetUp();
- ExtensionServiceTestBase::ExtensionServiceInitParams params =
+ extensions::ExtensionServiceTestBase::SetUp();
+ extensions::ExtensionServiceTestBase::ExtensionServiceInitParams params =
CreateDefaultInitParams();
params.profile_is_managed = is_managed_;
InitializeExtensionService(params);
« no previous file with comments | « chrome/browser/profile_resetter/profile_resetter_unittest.cc ('k') | chrome/browser/ui/app_list/app_list_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698