chrome/browser/intents/web_intents_registry_unittest.cc - Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own 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/intents/web_intents_registry_unittest.cc

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 11 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/media_gallery/media_galleries_test_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/intents/web_intents_registry_unittest.cc

diff --git a/chrome/browser/intents/web_intents_registry_unittest.cc b/chrome/browser/intents/web_intents_registry_unittest.cc

index 372ca7014ddb6745b94a473ae7de07fc3c40745e..d2738cd444abf48a401f71cb84db16999ec559b3 100644

--- a/chrome/browser/intents/web_intents_registry_unittest.cc

+++ b/chrome/browser/intents/web_intents_registry_unittest.cc

@@ -15,8 +15,10 @@

#include "chrome/browser/intents/web_intents_registry.h"

#include "chrome/browser/webdata/web_data_service.h"

#include "chrome/common/chrome_paths.h"

+#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_manifest_constants.h"

#include "chrome/common/extensions/extension_set.h"

+#include "chrome/common/extensions/manifest.h"

#include "chrome/common/extensions/manifest_handler.h"

#include "chrome/common/extensions/web_intents_handler.h"

#include "content/public/test/test_browser_thread.h"

@@ -25,6 +27,7 @@

using content::BrowserThread;

using extensions::Extension;

+using extensions::Manifest;

using webkit_glue::WebIntentServiceData;

class MockExtensionService: public TestExtensionService {

@@ -49,7 +52,7 @@ DictionaryValue* LoadManifestFile(const FilePath& path,

scoped_refptr<Extension> LoadExtensionWithLocation(

const std::string& name,

- Extension::Location location,

+ Manifest::Location location,

std::string* error) {

FilePath path;

PathService::Get(chrome::DIR_TEST_DATA, &path);

@@ -69,7 +72,7 @@ scoped_refptr<Extension> LoadExtensionWithLocation(

scoped_refptr<Extension> LoadExtension(const std::string& name,

std::string* error) {

- return LoadExtensionWithLocation(name, Extension::INTERNAL, error);

+ return LoadExtensionWithLocation(name, Manifest::INTERNAL, error);

}

scoped_refptr<Extension> LoadAndExpectSuccess(const std::string& name) {