Added proper extension manifest parser for launcher_page.

chrome/common/extensions/manifest_tests/extension_manifests_initvalue_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 "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_constants.h"
+#include "extensions/common/switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace extensions {
 
+namespace {
+
+// The ID of test manifests requiring whitelisting.
+const char kWhitelistID[] = "lmadimbbgapmngbiclpjjngmdickadpl";
+
+}  // namespace
+
 namespace errors = manifest_errors;
 namespace keys = manifest_keys;
 
 class InitValueManifestTest : public ExtensionManifestTest {
 };
 
+

[calamity, 2014/08/21 02:53:08]

nit: remove whitespace.

[Matt Giuca, 2014/08/22 02:48:40]

Done.

 TEST_F(InitValueManifestTest, InitFromValueInvalid) {
+  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+      extensions::switches::kWhitelistedExtensionID, kWhitelistID);
   Testcase testcases[] = {
     Testcase("init_invalid_version_missing.json", errors::kInvalidVersion),
     Testcase("init_invalid_version_invalid.json", errors::kInvalidVersion),
     Testcase("init_invalid_name_missing.json", errors::kInvalidName),
     Testcase("init_invalid_name_invalid.json", errors::kInvalidName),
     Testcase("init_invalid_description_invalid.json",
              errors::kInvalidDescription),
     Testcase("init_invalid_icons_invalid.json", errors::kInvalidIcons),
     Testcase("init_invalid_icons_path_invalid.json", errors::kInvalidIconPath),
+    Testcase("init_invalid_launcher_page_invalid.json",
+             errors::kInvalidLauncherPage),
+    Testcase("init_invalid_launcher_page_page_missing.json",
+             errors::kLauncherPagePageRequired),
+    Testcase("init_invalid_launcher_page_page_invalid.json",
+             errors::kInvalidLauncherPagePage),
     Testcase("init_invalid_script_invalid.json",
              errors::kInvalidContentScriptsList),
     Testcase("init_invalid_script_item_invalid.json",
              errors::kInvalidContentScript),
     Testcase("init_invalid_script_matches_missing.json",
              errors::kInvalidMatches),
     Testcase("init_invalid_script_matches_invalid.json",
              errors::kInvalidMatches),
     Testcase("init_invalid_script_matches_empty.json",
              errors::kInvalidMatchCount),
@@ skipping 21 matching lines @@
     Testcase("init_invalid_locale_empty.json", errors::kInvalidDefaultLocale),
     Testcase("init_invalid_min_chrome_invalid.json",
              errors::kInvalidMinimumChromeVersion),
     Testcase("init_invalid_chrome_version_too_low.json",
              errors::kChromeVersionTooLow),
     Testcase("init_invalid_short_name_empty.json",
              errors::kInvalidShortName),
     Testcase("init_invalid_short_name_type.json",
              errors::kInvalidShortName),
   };
-
   RunTestcases(testcases, arraysize(testcases),

[calamity, 2014/08/21 02:53:08]

nit: add whitespace back.

[Matt Giuca, 2014/08/22 02:48:40]

Done.

                EXPECT_TYPE_ERROR);
 }
 
 TEST_F(InitValueManifestTest, InitFromValueValid) {
+  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+      extensions::switches::kWhitelistedExtensionID, kWhitelistID);
   scoped_refptr<Extension> extension(LoadAndExpectSuccess(
       "init_valid_minimal.json"));
 
   base::FilePath path;
   PathService::Get(chrome::DIR_TEST_DATA, &path);
   path = path.AppendASCII("extensions");
 
   EXPECT_TRUE(Extension::IdIsValid(extension->id()));
   EXPECT_EQ("1.0.0.0", extension->VersionString());
   EXPECT_EQ("my extension", extension->name());
@@ skipping 31 matching lines @@
     Testcase("init_valid_app_minimum_chrome.json"),
 
     // Test a hosted app with a requirements section.
     Testcase("init_valid_app_requirements.json"),
 
     // Verify empty permission settings are considered valid.
     Testcase("init_valid_permissions_empty.json"),
 
     // We allow unknown API permissions, so this will be valid until we better
     // distinguish between API and host permissions.
-    Testcase("init_valid_permissions_unknown.json")
+    Testcase("init_valid_permissions_unknown.json"),
+
+    // Test an app with a launcher_page section.
+    Testcase("init_valid_launcher_page.json")
   };
 
   RunTestcases(testcases, arraysize(testcases),
                EXPECT_TYPE_SUCCESS);
 }
 
 TEST_F(InitValueManifestTest, InitFromValueValidNameInRTL) {
   std::string locale = l10n_util::GetApplicationLocale("");
   base::i18n::SetICUDefaultLocale("he");
 
@@ skipping 10 matching lines @@
 
   localized_name = base::WideToUTF16(L"Dictionary (\x05D1\x05D2" L" Google)");
   base::i18n::AdjustStringForLocaleDirection(&localized_name);
   EXPECT_EQ(localized_name, base::UTF8ToUTF16(extension->name()));
 
   // Reset locale.
   base::i18n::SetICUDefaultLocale(locale);
 }
 
 }  // namespace extensions