chrome/browser/extensions/app_process_apitest.cc - Issue 236213002: Move most of extension_file_util.cc into extensions/common/file_util.cc

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/app_process_apitest.cc

Issue 236213002: Move most of extension_file_util.cc into extensions/common/file_util.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase (file-util) Created 6 years, 8 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/api/tabs/tabs_api.cc ('k') | chrome/browser/extensions/component_loader.cc » ('j') | extensions/common/file_util_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/app_process_apitest.cc

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

index 58dece721ba4f560c832cc05a793aab40f17f432..235b11dcac181cefb272375d2e5690c8b2c359d7 100644

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

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

@@ -15,7 +15,6 @@

#include "chrome/browser/ui/browser_window.h"

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

#include "chrome/common/chrome_switches.h"

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

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

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

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

@@ -30,6 +29,7 @@

#include "extensions/browser/extension_system.h"

#include "extensions/browser/process_map.h"

#include "extensions/common/extension.h"

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

#include "extensions/common/switches.h"

#include "net/dns/mock_host_resolver.h"

#include "net/test/embedded_test_server/embedded_test_server.h"

@@ -303,7 +303,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_BookmarkAppGetsNormalProcess) {

// Load an app as a bookmark app.

std::string error;

- scoped_refptr<const Extension> extension(extension_file_util::LoadExtension(

+ scoped_refptr<const Extension> extension(extensions::file_util::LoadExtension(

test_data_dir_.AppendASCII("app_process"),

extensions::Manifest::UNPACKED,

Extension::FROM_BOOKMARK,

« no previous file with comments | « chrome/browser/extensions/api/tabs/tabs_api.cc ('k') | chrome/browser/extensions/component_loader.cc » ('j') | extensions/common/file_util_unittest.cc » ('J')