Move page action manifest parsing out of Extension; the first multi-key manifest handler.

chrome/common/extensions/manifest_tests/extension_manifest_test.h

Index: chrome/common/extensions/manifest_tests/extension_manifest_test.h
diff --git a/chrome/common/extensions/manifest_tests/extension_manifest_test.h b/chrome/common/extensions/manifest_tests/extension_manifest_test.h
index 47c13b05a3c66c78a1c1d1c58a0ed97d3d794808..126a88f81e0d1b16cb2027bc65f5f302e7653c97 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifest_test.h
+++ b/chrome/common/extensions/manifest_tests/extension_manifest_test.h
@@ -5,8 +5,9 @@
 #ifndef CHROME_COMMON_EXTENSIONS_MANIFEST_TESTS_EXTENSION_MANIFEST_TEST_H_
 #define CHROME_COMMON_EXTENSIONS_MANIFEST_TESTS_EXTENSION_MANIFEST_TEST_H_
 
-#include "base/values.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/values.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/features/feature.h"
@@ -20,11 +21,6 @@ class ExtensionManifestTest : public testing::Test {
   ExtensionManifestTest();
 
  protected:
-  // If filename is a relative path, LoadManifestFile will treat it relative to
-  // the appropriate test directory.
-  static DictionaryValue* LoadManifestFile(const std::string& filename,
-                                           std::string* error);
-
   // Helper class that simplifies creating methods that take either a filename
   // to a manifest or the manifest itself.
   class Manifest {
@@ -46,7 +42,8 @@ class ExtensionManifestTest : public testing::Test {
 
     const std::string& name() const { return name_; };
 
-    DictionaryValue* GetManifest(std::string* error) const;
+    DictionaryValue* GetManifest(char const* test_data_dir,
+                                 std::string* error) const;
 
    private:
     const std::string name_;
@@ -54,6 +51,15 @@ class ExtensionManifestTest : public testing::Test {
     mutable scoped_ptr<DictionaryValue> manifest_holder_;
   };
 
+  // The subdirectory in which to find test data files.
+  virtual char const* test_data_dir() {
+    return "manifest_tests";
+  }
+
+  scoped_ptr<DictionaryValue> LoadManifest(
+      char const* manifest_name,
+      std::string* error);
+
   scoped_refptr<extensions::Extension> LoadExtension(
       const Manifest& manifest,
       std::string* error,