Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

Side by Side Diff: chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc

Issue 12042096: Move page action manifest parsing out of Extension; the first multi-key manifest handler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/i18n/rtl.h" 5 #include "base/i18n/rtl.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/common/chrome_paths.h" 8 #include "chrome/common/chrome_paths.h"
9 #include "chrome/common/extensions/api/extension_action/page_action_handler.h"
9 #include "chrome/common/extensions/api/i18n/default_locale_handler.h" 10 #include "chrome/common/extensions/api/i18n/default_locale_handler.h"
10 #include "chrome/common/extensions/extension.h" 11 #include "chrome/common/extensions/extension.h"
11 #include "chrome/common/extensions/extension_manifest_constants.h" 12 #include "chrome/common/extensions/extension_manifest_constants.h"
12 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" 13 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
13 #include "chrome/common/extensions/manifest_url_handler.h" 14 #include "chrome/common/extensions/manifest_url_handler.h"
14 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
15 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
16 17
17 #if defined(TOOLKIT_GTK) 18 #if defined(TOOLKIT_GTK)
18 #include <gtk/gtk.h> 19 #include <gtk/gtk.h>
19 #endif 20 #endif
20 21
21 namespace errors = extension_manifest_errors; 22 namespace errors = extension_manifest_errors;
23 namespace keys = extension_manifest_keys;
22 24
23 class InitValueManifestTest : public ExtensionManifestTest { 25 class InitValueManifestTest : public ExtensionManifestTest {
24 virtual void SetUp() OVERRIDE { 26 virtual void SetUp() OVERRIDE {
25 ExtensionManifestTest::SetUp(); 27 ExtensionManifestTest::SetUp();
26 extensions::ManifestHandler::Register( 28 extensions::ManifestHandler::Register(
27 extension_manifest_keys::kOptionsPage, 29 keys::kOptionsPage,
28 make_linked_ptr(new extensions::OptionsPageHandler)); 30 make_linked_ptr(new extensions::OptionsPageHandler));
29 extensions::ManifestHandler::Register( 31 extensions::ManifestHandler::Register(
30 extension_manifest_keys::kDefaultLocale, 32 keys::kDefaultLocale,
31 make_linked_ptr(new extensions::DefaultLocaleHandler)); 33 make_linked_ptr(new extensions::DefaultLocaleHandler));
34 linked_ptr<extensions::PageActionHandler> page_action_handler(
35 new extensions::PageActionHandler);
36 extensions::ManifestHandler::Register(keys::kPageAction, page_action_handler);
37 extensions::ManifestHandler::Register(
38 keys::kPageActions, page_action_handler);
32 } 39 }
33 }; 40 };
34 41
35 TEST_F(InitValueManifestTest, InitFromValueInvalid) { 42 TEST_F(InitValueManifestTest, InitFromValueInvalid) {
36 Testcase testcases[] = { 43 Testcase testcases[] = {
37 Testcase("init_invalid_version_missing.json", errors::kInvalidVersion), 44 Testcase("init_invalid_version_missing.json", errors::kInvalidVersion),
38 Testcase("init_invalid_version_invalid.json", errors::kInvalidVersion), 45 Testcase("init_invalid_version_invalid.json", errors::kInvalidVersion),
39 Testcase("init_invalid_name_missing.json", errors::kInvalidName), 46 Testcase("init_invalid_name_missing.json", errors::kInvalidName),
40 Testcase("init_invalid_name_invalid.json", errors::kInvalidName), 47 Testcase("init_invalid_name_invalid.json", errors::kInvalidName),
41 Testcase("init_invalid_description_invalid.json", 48 Testcase("init_invalid_description_invalid.json",
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 base::i18n::AdjustStringForLocaleDirection(&localized_name); 168 base::i18n::AdjustStringForLocaleDirection(&localized_name);
162 EXPECT_EQ(localized_name, UTF8ToUTF16(extension->name())); 169 EXPECT_EQ(localized_name, UTF8ToUTF16(extension->name()));
163 170
164 // Reset locale. 171 // Reset locale.
165 #if defined(TOOLKIT_GTK) 172 #if defined(TOOLKIT_GTK)
166 gtk_widget_set_default_direction(gtk_dir); 173 gtk_widget_set_default_direction(gtk_dir);
167 #else 174 #else
168 base::i18n::SetICUDefaultLocale(locale); 175 base::i18n::SetICUDefaultLocale(locale);
169 #endif 176 #endif
170 } 177 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698