chrome/browser/extensions/crx_installer_browsertest.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/crx_installer_browsertest.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: zip (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

« apps/shell/DEPS ('K') | « chrome/browser/extensions/crx_installer.cc ('k') | chrome/browser/extensions/extension_creator.cc » ('j') | chrome/common/extensions/extension_file_util_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/crx_installer_browsertest.cc

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

index 84510d81f9bc00d5fe9a3098077cc105956394bb..e32bc1bd0028f20325f8e4901da4ec14f3163cee 100644

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

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

@@ -14,7 +14,6 @@

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

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

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

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

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

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

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

@@ -23,6 +22,7 @@

#include "extensions/browser/extension_system.h"

#include "extensions/common/extension.h"

#include "extensions/common/feature_switch.h"

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

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

#include "extensions/common/switches.h"

#include "grit/generated_resources.h"

@@ -147,7 +147,7 @@ class ExtensionCrxInstallerTest : public ExtensionBrowserTest {

base::FilePath ext_path = test_data_dir_.AppendASCII(manifest_dir);

std::string error;

scoped_ptr<base::DictionaryValue> parsed_manifest(

- extension_file_util::LoadManifest(ext_path, &error));

+ file_util::LoadManifest(ext_path, &error));

if (!parsed_manifest.get() || !error.empty())

return result.Pass();