chrome/browser/extensions/chrome_app_api_browsertest.cc - Issue 23257005: Move Feature and Manifest to top-level 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/browser/extensions/chrome_app_api_browsertest.cc

Issue 23257005: Move Feature and Manifest to top-level extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 4 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:

Index: chrome/browser/extensions/chrome_app_api_browsertest.cc

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

index 97f923d0da34b064f776bb8c47fed9ec8441c325..1c5e417e73207b3e0b8b77cbfdf5ac978a7fc45b 100644

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

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

@@ -16,10 +16,10 @@

#include "chrome/browser/ui/tabs/tab_strip_model.h"

#include "chrome/common/chrome_switches.h"

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

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

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

#include "content/public/browser/web_contents.h"

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

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

#include "net/dns/mock_host_resolver.h"

#include "url/gurl.h"