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

chrome/common/extensions/extension_unittest.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/extension.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/extensions/command.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/features/feature.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/common/extensions/permissions/api_permission.h"
 #include "chrome/common/extensions/permissions/permission_set.h"
 #include "chrome/common/extensions/permissions/socket_permission.h"
 #include "chrome/common/extensions/permissions/usb_device_permission.h"
 #include "chrome/common/url_constants.h"
 #include "extensions/common/error_utils.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/mime_sniffer.h"
 #include "net/base/mock_host_resolver.h"
 #include "skia/ext/image_operations.h"
@@ skipping 55 matching lines @@
                                              const std::string& test_file) {
   return LoadManifest(dir, test_file, Extension::NO_FLAGS);
 }
 
 static scoped_refptr<Extension> LoadManifestStrict(
     const std::string& dir,
     const std::string& test_file) {
   return LoadManifest(dir, test_file, Extension::NO_FLAGS);
 }
 
-static scoped_ptr<ActionInfo> LoadAction(
-    const std::string& manifest) {
-  scoped_refptr<Extension> extension = LoadManifest("page_action",
-      manifest);
-  EXPECT_TRUE(extension->page_action_info());
-  if (extension->page_action_info()) {
-    return make_scoped_ptr(new ActionInfo(
-        *extension->page_action_info()));
-  }
-  ADD_FAILURE() << "Expected manifest in " << manifest
-                << " to include a page_action section.";
-  return scoped_ptr<ActionInfo>();
-}
-
-static void LoadActionAndExpectError(const std::string& manifest,
-                                     const std::string& expected_error) {
-  std::string error;
-  scoped_refptr<Extension> extension = LoadManifestUnchecked("page_action",
-      manifest, Extension::INTERNAL, Extension::NO_FLAGS, &error);
-  EXPECT_FALSE(extension);
-  EXPECT_EQ(expected_error, error);
-}
-
-}
+}  // namespace
 
 class ExtensionTest : public testing::Test {
 };
 
 // We persist location values in the preferences, so this is a sanity test that
 // someone doesn't accidentally change them.
 TEST(ExtensionTest, LocationValuesTest) {
   ASSERT_EQ(0, Extension::INVALID);
   ASSERT_EQ(1, Extension::INTERNAL);
   ASSERT_EQ(2, Extension::EXTERNAL_PREF);
@@ skipping 68 matching lines @@
   EXPECT_TRUE(extension_file_util::ValidateExtension(extension.get(),
                                                      &err, &warnings));
   EXPECT_EQ(0U, warnings.size());
 
   EXPECT_EQ(extension->path().AppendASCII("test.html").value(),
             extension->GetResource("test.html").GetFilePath().value());
   EXPECT_EQ(extension->path().AppendASCII("test.js").value(),
             extension->GetResource("test.js").GetFilePath().value());
 }
 
-TEST(ExtensionTest, LoadPageActionHelper) {
-  scoped_ptr<ActionInfo> action;
-
-  // First try with an empty dictionary.
-  action = LoadAction("page_action_empty.json");
-  ASSERT_TRUE(action != NULL);
-
-  // Now setup some values to use in the action.
-  const std::string id("MyExtensionActionId");
-  const std::string name("MyExtensionActionName");
-  std::string img1("image1.png");
-
-  action = LoadAction("page_action.json");
-  ASSERT_TRUE(NULL != action.get());
-  ASSERT_EQ(id, action->id);
-
-  // No title, so fall back to name.
-  ASSERT_EQ(name, action->default_title);
-  ASSERT_EQ(img1,
-            action->default_icon.Get(extension_misc::EXTENSION_ICON_ACTION,
-                                     ExtensionIconSet::MATCH_EXACTLY));
-
-  // Same test with explicitly set type.
-  action = LoadAction("page_action_type.json");
-  ASSERT_TRUE(NULL != action.get());
-
-  // Try an action without id key.
-  action = LoadAction("page_action_no_id.json");
-  ASSERT_TRUE(NULL != action.get());
-
-  // Then try without the name key. It's optional, so no error.
-  action = LoadAction("page_action_no_name.json");
-  ASSERT_TRUE(NULL != action.get());
-  ASSERT_TRUE(action->default_title.empty());
-
-  // Then try without the icon paths key.
-  action = LoadAction("page_action_no_icon.json");
-  ASSERT_TRUE(NULL != action.get());
-
-  // Now test that we can parse the new format for page actions.
-  const std::string kTitle("MyExtensionActionTitle");
-  const std::string kIcon("image1.png");
-  const std::string kPopupHtmlFile("a_popup.html");
-
-  action = LoadAction("page_action_new_format.json");
-  ASSERT_TRUE(action.get());
-  ASSERT_EQ(kTitle, action->default_title);
-  ASSERT_FALSE(action->default_icon.empty());
-
-  // Invalid title should give an error even with a valid name.
-  LoadActionAndExpectError("page_action_invalid_title.json",
-      errors::kInvalidPageActionDefaultTitle);
-
-  // Invalid name should give an error only with no title.
-  action = LoadAction("page_action_invalid_name.json");
-  ASSERT_TRUE(NULL != action.get());
-  ASSERT_EQ(kTitle, action->default_title);
-
-  LoadActionAndExpectError("page_action_invalid_name_no_title.json",
-      errors::kInvalidPageActionName);
-
-  // Test that keys "popup" and "default_popup" both work, but can not
-  // be used at the same time.
-  // These tests require an extension_url, so we also load the manifest.
-
-  // Only use "popup", expect success.
-  scoped_refptr<Extension> extension = LoadManifest("page_action",
-             "page_action_popup.json");
-  action = LoadAction("page_action_popup.json");
-  ASSERT_TRUE(NULL != action.get());
-  ASSERT_STREQ(
-      extension->url().Resolve(kPopupHtmlFile).spec().c_str(),
-      action->default_popup_url.spec().c_str());
-
-  // Use both "popup" and "default_popup", expect failure.
-  LoadActionAndExpectError("page_action_popup_and_default_popup.json",
-      ErrorUtils::FormatErrorMessage(
-          errors::kInvalidPageActionOldAndNewKeys,
-          keys::kPageActionDefaultPopup,
-          keys::kPageActionPopup));
-
-  // Use only "default_popup", expect success.
-  extension = LoadManifest("page_action", "page_action_popup.json");
-  action = LoadAction("page_action_default_popup.json");
-  ASSERT_TRUE(NULL != action.get());
-  ASSERT_STREQ(
-      extension->url().Resolve(kPopupHtmlFile).spec().c_str(),
-      action->default_popup_url.spec().c_str());
-
-  // Setting default_popup to "" is the same as having no popup.
-  action = LoadAction("page_action_empty_default_popup.json");
-  ASSERT_TRUE(NULL != action.get());
-  EXPECT_TRUE(action->default_popup_url.is_empty());
-  ASSERT_STREQ(
-      "",
-      action->default_popup_url.spec().c_str());
-
-  // Setting popup to "" is the same as having no popup.
-  action = LoadAction("page_action_empty_popup.json");
-
-  ASSERT_TRUE(NULL != action.get());
-  EXPECT_TRUE(action->default_popup_url.is_empty());
-  ASSERT_STREQ(
-      "",
-      action->default_popup_url.spec().c_str());
-}
-
 TEST(ExtensionTest, IdIsValid) {
   EXPECT_TRUE(Extension::IdIsValid("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
   EXPECT_TRUE(Extension::IdIsValid("pppppppppppppppppppppppppppppppp"));
   EXPECT_TRUE(Extension::IdIsValid("abcdefghijklmnopabcdefghijklmnop"));
   EXPECT_TRUE(Extension::IdIsValid("ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOP"));
   EXPECT_FALSE(Extension::IdIsValid("abcdefghijklmnopabcdefghijklmno"));
   EXPECT_FALSE(Extension::IdIsValid("abcdefghijklmnopabcdefghijklmnopa"));
   EXPECT_FALSE(Extension::IdIsValid("0123456789abcdef0123456789abcdef"));
   EXPECT_FALSE(Extension::IdIsValid("abcdefghijklmnopabcdefghijklmnoq"));
   EXPECT_FALSE(Extension::IdIsValid("abcdefghijklmnopabcdefghijklmno0"));
@@ skipping 956 matching lines @@
   scoped_refptr<Extension> extension(
       MakeSyncTestExtension(EXTENSION, GURL(), GURL(),
                             Extension::INTERNAL, 2, FilePath(),
                             Extension::NO_FLAGS));
   if (extension)
     EXPECT_EQ(extension->GetSyncType(), Extension::SYNC_TYPE_NONE);
 }
 #endif // !defined(OS_CHROMEOS)
 
 }  // namespace extensions