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

Unified Diff: chrome/browser/extensions/external_policy_loader_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/external_policy_loader_unittest.cc
diff --git a/chrome/browser/extensions/external_policy_loader_unittest.cc b/chrome/browser/extensions/external_policy_loader_unittest.cc
index b65557491099fc45be8a2a993cb2542c2c6c414c..ad3fb6d8d7fce3cca1d322d644f1e81f7af7951f 100644
--- a/chrome/browser/extensions/external_policy_loader_unittest.cc
+++ b/chrome/browser/extensions/external_policy_loader_unittest.cc
@@ -13,6 +13,7 @@
#include "chrome/browser/extensions/external_provider_impl.h"
#include "chrome/browser/extensions/external_provider_interface.h"
#include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_pref_service.h"
#include "chrome/test/base/testing_profile.h"
@@ -56,8 +57,8 @@ class MockExternalPolicyProviderVisitor
provider_.reset(new ExternalProviderImpl(
this,
new ExternalPolicyLoader(profile_.get()),
- Extension::INVALID,
- Extension::EXTERNAL_POLICY_DOWNLOAD,
+ Manifest::INVALID_LOCATION,
+ Manifest::EXTERNAL_POLICY_DOWNLOAD,
Extension::NO_FLAGS));
// Extensions will be removed from this list as they visited,
@@ -70,7 +71,7 @@ class MockExternalPolicyProviderVisitor
virtual bool OnExternalExtensionFileFound(const std::string& id,
const Version* version,
const FilePath& path,
- Extension::Location unused,
+ Manifest::Location unused,
int unused2,
bool unused3) {
ADD_FAILURE() << "There should be no external extensions from files.";
@@ -79,15 +80,15 @@ class MockExternalPolicyProviderVisitor
virtual bool OnExternalExtensionUpdateUrlFound(
const std::string& id, const GURL& update_url,
- Extension::Location location) {
+ Manifest::Location location) {
// Extension has the correct location.
- EXPECT_EQ(Extension::EXTERNAL_POLICY_DOWNLOAD, location);
+ EXPECT_EQ(Manifest::EXTERNAL_POLICY_DOWNLOAD, location);
// Provider returns the correct location when asked.
- Extension::Location location1;
+ Manifest::Location location1;
scoped_ptr<Version> version1;
provider_->GetExtensionDetails(id, &location1, &version1);
- EXPECT_EQ(Extension::EXTERNAL_POLICY_DOWNLOAD, location1);
+ EXPECT_EQ(Manifest::EXTERNAL_POLICY_DOWNLOAD, location1);
EXPECT_FALSE(version1.get());
// Remove the extension from our list.
« no previous file with comments | « chrome/browser/extensions/extension_webkit_preferences.cc ('k') | chrome/browser/extensions/external_provider_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698