chrome/browser/managed_mode/managed_user_service_unittest.cc - Issue 318863008: Move ExtensionServiceTestBase into it's own header/cc file

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/managed_mode/managed_user_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

« no previous file with comments | « chrome/browser/extensions/user_script_listener_unittest.cc ('k') | chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/managed_mode/managed_user_service_unittest.cc

diff --git a/chrome/browser/managed_mode/managed_user_service_unittest.cc b/chrome/browser/managed_mode/managed_user_service_unittest.cc

index d70d199548bcf0c48033c1a710d3e3fc6e934832..96728df0d91c8387b0eda003adb714ff62f34bb3 100644

--- a/chrome/browser/managed_mode/managed_user_service_unittest.cc

+++ b/chrome/browser/managed_mode/managed_user_service_unittest.cc

@@ -7,7 +7,7 @@

#include "base/prefs/scoped_user_pref_update.h"

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/chrome_notification_types.h"

-#include "chrome/browser/extensions/extension_service_unittest.h"

+#include "chrome/browser/extensions/extension_service_test_base.h"

#include "chrome/browser/extensions/unpacked_installer.h"

#include "chrome/browser/managed_mode/custodian_profile_downloader_service.h"

#include "chrome/browser/managed_mode/custodian_profile_downloader_service_factory.h"

@@ -165,7 +165,8 @@ TEST_F(ManagedUserServiceTest, ShutDownCustodianProfileDownloader) {

}

#if !defined(OS_ANDROID)

-class ManagedUserServiceExtensionTestBase : public ExtensionServiceTestBase {

+class ManagedUserServiceExtensionTestBase

+ : public extensions::ExtensionServiceTestBase {

public:

explicit ManagedUserServiceExtensionTestBase(bool is_managed)

: is_managed_(is_managed),