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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/extensions/extension_error_controller_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 unified diff | Download patch

« no previous file with comments | « chrome/browser/extensions/extension_context_menu_model_unittest.cc ('k') | chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/memory/ref_counted.h"	5 #include "base/memory/ref_counted.h"

6 #include "chrome/browser/extensions/extension_error_controller.h"	6 #include "chrome/browser/extensions/extension_error_controller.h"

7 #include "chrome/browser/extensions/extension_error_ui.h"	7 #include "chrome/browser/extensions/extension_error_ui.h"

8 #include "chrome/browser/extensions/extension_service.h"	8 #include "chrome/browser/extensions/extension_service.h"

9 #include "chrome/browser/extensions/extension_service_unittest.h"	9 #include "chrome/browser/extensions/extension_service_test_base.h"

10 #include "chrome/browser/profiles/profile.h"	10 #include "chrome/browser/profiles/profile.h"

11 #include "chrome/test/base/testing_profile.h"	11 #include "chrome/test/base/testing_profile.h"

12 #include "extensions/browser/extension_prefs.h"	12 #include "extensions/browser/extension_prefs.h"

13 #include "extensions/browser/extension_registry.h"	13 #include "extensions/browser/extension_registry.h"

14 #include "extensions/common/extension.h"	14 #include "extensions/common/extension.h"

15 #include "extensions/common/extension_builder.h"	15 #include "extensions/common/extension_builder.h"

16 #include "extensions/common/value_builder.h"	16 #include "extensions/common/value_builder.h"

17	17

18 namespace extensions {	18 namespace extensions {

19	19

(...skipping 185 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
205 GetPrefs()->AcknowledgeBlacklistedExtension(extension->id());	205 GetPrefs()->AcknowledgeBlacklistedExtension(extension->id());

206	206

207 service_->Init();	207 service_->Init();

208	208

209 // We should never have made an alert, because the extension should already	209 // We should never have made an alert, because the extension should already

210 // be acknowledged.	210 // be acknowledged.

211 ASSERT_FALSE(g_error_ui);	211 ASSERT_FALSE(g_error_ui);

212 }	212 }

213	213

214 } // namespace extensions	214 } // namespace extensions

OLD	NEW