[Hotword, Extensions] Removing EXTERNAL_COMPONENT from IsPolicyLocation, adding a function to check…

extensions/common/manifest.h

 // Copyright 2013 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.
 
 #ifndef EXTENSIONS_COMMON_MANIFEST_H_
 #define EXTENSIONS_COMMON_MANIFEST_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 78 matching lines @@
   static inline bool IsAutoUpdateableLocation(Location location) {
     // Only internal and external extensions can be autoupdated.
     return location == INTERNAL ||
            IsExternalLocation(location);
   }
 
   // Whether the |location| is a source of extensions force-installed through
   // policy.
   static inline bool IsPolicyLocation(Location location) {
     return location == EXTERNAL_POLICY ||
-           location == EXTERNAL_POLICY_DOWNLOAD ||
-           location == EXTERNAL_COMPONENT;
+           location == EXTERNAL_POLICY_DOWNLOAD;
+  }
+
+  // Whether the |location| is an extension intended to be an internal part of
+  // Chrome.
+  static inline bool IsComponentLocation(Location location) {
+    return location == COMPONENT || location == EXTERNAL_COMPONENT;
   }
 
   // Unpacked extensions start off with file access since they are a developer
   // feature.
   static inline bool ShouldAlwaysAllowFileAccess(Location location) {
     return IsUnpackedLocation(location);
   }
 
   Manifest(Location location, scoped_ptr<base::DictionaryValue> value);
   virtual ~Manifest();
@@ skipping 73 matching lines @@
   scoped_ptr<base::DictionaryValue> value_;
 
   Type type_;
 
   DISALLOW_COPY_AND_ASSIGN(Manifest);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_COMMON_MANIFEST_H_