Rename extension_manifest_keys namespace to extensions::manifest_keys.

chrome/common/extensions/manifest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/manifest.h"
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/features/feature.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/features/feature_provider.h"
 #include "extensions/common/install_warning.h"
-
-namespace errors = extension_manifest_errors;
-namespace keys = extension_manifest_keys;
+#include "extensions/common/manifest_constants.h"
 
 namespace extensions {
 
+namespace keys = manifest_keys;
+
 namespace {
 
 // Rank extension locations in a way that allows
 // Manifest::GetHigherPriorityLocation() to compare locations.
 // An extension installed from two locations will have the location
 // with the higher rank, as returned by this function. The actual
 // integer values may change, and should never be persisted.
 int GetLocationRank(Manifest::Location location) {
   const int kInvalidRank = -1;
   int rank = kInvalidRank;  // Will CHECK that rank is not kInvalidRank.
@@ skipping 90 matching lines @@
   CHECK_NE(type_, TYPE_UNKNOWN);
 }
 
 Manifest::~Manifest() {
 }
 
 bool Manifest::ValidateManifest(
     std::string* error,
     std::vector<InstallWarning>* warnings) const {
   *error = "";
-  if (type_ == Manifest::TYPE_PLATFORM_APP && GetManifestVersion() < 2) {
-    *error = errors::kPlatformAppNeedsManifestVersion2;
-    return false;
-  }
 
   // Check every feature to see if its in the manifest. Note that this means
   // we will ignore keys that are not features; we do this for forward
   // compatibility.
   // TODO(aa): Consider having an error here in the case of strict error
   // checking to let developers know when they screw up.
 
   FeatureProvider* provider = FeatureProvider::GetByName("manifest");
   const std::vector<std::string>& feature_names =
       provider->GetAllFeatureNames();
@@ skipping 106 matching lines @@
   Feature* feature = FeatureProvider::GetByName("manifest")->GetFeature(key);
   if (!feature)
     return true;
 
   return feature->IsAvailableToManifest(
       extension_id_, type_, Feature::ConvertLocation(location_),
       GetManifestVersion()).is_available();
 }
 
 }  // namespace extensions