chrome/browser/extensions/external_provider_impl_chromeos_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/extensions/external_provider_impl_chromeos_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/extension_service_unittest.cc ('k') | chrome/browser/extensions/external_provider_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc

diff --git a/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc b/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc

index 54b83647d4e0ad04217d20aaa6b357a1521352d4..3832694891d8f1ab543413d0150eb27c9984a0bb 100644

--- a/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc

+++ b/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc

@@ -11,7 +11,8 @@

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/chromeos/customization_document.h"

#include "chrome/browser/chromeos/login/users/fake_user_manager.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/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/test/base/testing_browser_process.h"

@@ -64,9 +65,8 @@ class ExternalProviderImplChromeOSTest : public ExtensionServiceTestBase {

chromeos::ServicesCustomizationDocument::RegisterPrefs(

local_state_.registry());

- external_externsions_overrides_.reset(

- new base::ScopedPathOverride(chrome::DIR_EXTERNAL_EXTENSIONS,

- data_dir_.Append("external")));

+ external_externsions_overrides_.reset(new base::ScopedPathOverride(

+ chrome::DIR_EXTERNAL_EXTENSIONS, data_dir().Append("external")));

chromeos::system::StatisticsProvider::SetTestProvider(

&mock_statistics_provider_);