chrome/common/extensions/permissions/settings_override_permission_unittest.cc - Issue 578653005: Revert "Refactor ExtensionManifestTest to allow usage in src/extensions"

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/common/extensions/permissions/settings_override_permission_unittest.cc

Issue 578653005: Revert "Refactor ExtensionManifestTest to allow usage in src/extensions" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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/common/extensions/manifest_unittest.cc ('k') | chrome/test/data/extensions/manifest_tests/shared_module_export.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/permissions/settings_override_permission_unittest.cc

diff --git a/chrome/common/extensions/permissions/settings_override_permission_unittest.cc b/chrome/common/extensions/permissions/settings_override_permission_unittest.cc

index e154769090e719090b9aaadaf7299a02bed99d8f..61f6b5be56f1481b3a3a829c226849ede9a8d0f4 100644

--- a/chrome/common/extensions/permissions/settings_override_permission_unittest.cc

+++ b/chrome/common/extensions/permissions/settings_override_permission_unittest.cc

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

#include "base/basictypes.h"

#include "base/strings/utf_string_conversions.h"

#include "base/values.h"

-#include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h"

+#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"

#include "extensions/common/manifest_constants.h"

#include "extensions/common/permissions/permission_set.h"

#include "extensions/common/permissions/permissions_data.h"

@@ -18,7 +18,7 @@ namespace extensions {

namespace {

-class SettingsOverridePermissionTest : public ChromeManifestTest {

+class SettingsOverridePermissionTest : public ExtensionManifestTest {

protected:

enum Flags {

kHomepage = 1,

@@ -56,7 +56,7 @@ class SettingsOverridePermissionTest : public ChromeManifestTest {

ext_manifest.Set(

manifest_keys::kSettingsOverride, settings_override.release());

- ManifestData manifest(&ext_manifest, "test");

+ Manifest manifest(&ext_manifest, "test");

return LoadAndExpectSuccess(manifest);

}

};