chrome/browser/profile_resetter/automatic_profile_resetter_delegate_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/profile_resetter/automatic_profile_resetter_delegate_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/managed_mode/managed_user_service_unittest.cc ('k') | chrome/browser/profile_resetter/profile_resetter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc

diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc

index 22019786dff48c4675f47696ab87ec1731f2bed7..3335ff3de75ce35e1e0a7643c59924454b6b2471 100644

--- a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc

+++ b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc

@@ -20,7 +20,8 @@

#include "base/values.h"

#include "chrome/app/chrome_command_ids.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/google/google_brand.h"

#include "chrome/browser/profile_resetter/brandcoded_default_settings.h"

#include "chrome/browser/profile_resetter/profile_reset_global_error.h"

@@ -161,14 +162,14 @@ void ServicePendingBrancodedConfigFetch(net::TestURLFetcher* fetcher,

// ExtensionServiceTestBase sets up a TestingProfile with the ExtensionService,

// we then add the TemplateURLService, so the ProfileResetter can be exercised.

class AutomaticProfileResetterDelegateTest

- : public ExtensionServiceTestBase,

+ : public extensions::ExtensionServiceTestBase,

public TemplateURLServiceTestUtilBase {

protected:

AutomaticProfileResetterDelegateTest() {}

virtual ~AutomaticProfileResetterDelegateTest() {}

virtual void SetUp() OVERRIDE {

- ExtensionServiceTestBase::SetUp();

+ extensions::ExtensionServiceTestBase::SetUp();

ExtensionServiceInitParams params = CreateDefaultInitParams();

params.pref_file.clear(); // Prescribes a TestingPrefService to be created.

InitializeExtensionService(params);

@@ -179,7 +180,7 @@ class AutomaticProfileResetterDelegateTest

virtual void TearDown() OVERRIDE {

resetter_delegate_.reset();

- ExtensionServiceTestBase::TearDown();

+ extensions::ExtensionServiceTestBase::TearDown();

}

scoped_ptr<TemplateURL> CreateTestTemplateURL() {