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

chrome/common/extensions/manifest_tests/extension_manifests_ui_unittest.cc

Index: chrome/common/extensions/manifest_tests/extension_manifests_ui_unittest.cc
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_ui_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_ui_unittest.cc
index 5e051c5a19480d721a7b2dcf56d530bac9b8fcdc..c07b65915b2d4cb0697a1277b2343ea88b1f9fa0 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_ui_unittest.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifests_ui_unittest.cc
@@ -2,13 +2,25 @@
 // 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_tests/extension_manifest_test.h"
-
+#include "chrome/common/extensions/api/extension_action/page_action_handler.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/extensions/manifest_handler.h"
+#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace errors = extension_manifest_errors;
+namespace extensions {
 
-TEST_F(ExtensionManifestTest, DisallowMultipleUISurfaces) {
-  LoadAndExpectError("multiple_ui_surfaces.json", errors::kOneUISurfaceOnly);
+class UIManifestTest : public ExtensionManifestTest {
+ protected:
+   virtual void SetUp() OVERRIDE {
+     ExtensionManifestTest::SetUp();
+    ManifestMultiKeyHandler::Register(new PageActionHandler);
+   }
+};
+
+TEST_F(UIManifestTest, DisallowMultipleUISurfaces) {
+  LoadAndExpectError("multiple_ui_surfaces.json",
+                     extension_manifest_errors::kOneUISurfaceOnly);
 }
+
+}  // namespace extensions