Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(317)

Unified Diff: chrome/browser/extensions/extension_sorting_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
Index: chrome/browser/extensions/extension_sorting_unittest.cc
diff --git a/chrome/browser/extensions/extension_sorting_unittest.cc b/chrome/browser/extensions/extension_sorting_unittest.cc
index dfee25dd469238cbf78d681f583e8c873bd962fa..d12a854d3726c5952dbad0188e038e1f81b56adb 100644
--- a/chrome/browser/extensions/extension_sorting_unittest.cc
+++ b/chrome/browser/extensions/extension_sorting_unittest.cc
@@ -12,6 +12,7 @@
#include "testing/gtest/include/gtest/gtest.h"
using extensions::Extension;
+using extensions::Manifest;
namespace keys = extension_manifest_keys;
@@ -627,14 +628,14 @@ class ExtensionSortingPreinstalledAppsBase
std::string error;
app1_scoped_ = Extension::Create(
- prefs_.temp_dir().AppendASCII("app1_"), Extension::EXTERNAL_PREF,
+ prefs_.temp_dir().AppendASCII("app1_"), Manifest::EXTERNAL_PREF,
simple_dict, Extension::NO_FLAGS, &error);
prefs()->OnExtensionInstalled(app1_scoped_.get(),
Extension::ENABLED,
syncer::StringOrdinal());
app2_scoped_ = Extension::Create(
- prefs_.temp_dir().AppendASCII("app2_"), Extension::EXTERNAL_PREF,
+ prefs_.temp_dir().AppendASCII("app2_"), Manifest::EXTERNAL_PREF,
simple_dict, Extension::NO_FLAGS, &error);
prefs()->OnExtensionInstalled(app2_scoped_.get(),
Extension::ENABLED,
@@ -804,7 +805,7 @@ class ExtensionSortingDefaultOrdinalsBase : public ExtensionSortingTest {
std::string errors;
scoped_refptr<Extension> app = Extension::Create(
- prefs_.temp_dir().AppendASCII(name), Extension::EXTERNAL_PREF,
+ prefs_.temp_dir().AppendASCII(name), Manifest::EXTERNAL_PREF,
simple_dict, Extension::NO_FLAGS, &errors);
EXPECT_TRUE(app) << errors;
EXPECT_TRUE(Extension::IdIsValid(app->id()));

Powered by Google App Engine
This is Rietveld 408576698