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

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, 11 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/extension.h" 10 #include "chrome/common/extensions/extension.h"
10 #include "chrome/common/extensions/extension_manifest_constants.h" 11 #include "chrome/common/extensions/extension_manifest_constants.h"
11 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" 12 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
12 #include "chrome/common/extensions/manifest_url_handler.h" 13 #include "chrome/common/extensions/manifest_url_handler.h"
13 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
14 #include "ui/base/l10n/l10n_util.h" 15 #include "ui/base/l10n/l10n_util.h"
15 16
16 #if defined(TOOLKIT_GTK) 17 #if defined(TOOLKIT_GTK)
17 #include <gtk/gtk.h> 18 #include <gtk/gtk.h>
18 #endif 19 #endif
19 20
20 namespace errors = extension_manifest_errors; 21 namespace errors = extension_manifest_errors;
21 22
22 class InitValueManifestTest : public ExtensionManifestTest { 23 class InitValueManifestTest : public ExtensionManifestTest {
23 virtual void SetUp() OVERRIDE { 24 virtual void SetUp() OVERRIDE {
24 ExtensionManifestTest::SetUp(); 25 ExtensionManifestTest::SetUp();
25 extensions::ManifestHandler::Register(extension_manifest_keys::kOptionsPage, 26 extensions::ManifestHandler::Register(extension_manifest_keys::kOptionsPage,
26 new extensions::OptionsPageHandler); 27 new extensions::OptionsPageHandler);
28 extensions::ManifestMultiKeyHandler::Register(
29 new extensions::PageActionHandler);
27 } 30 }
28 }; 31 };
29 32
30 TEST_F(InitValueManifestTest, InitFromValueInvalid) { 33 TEST_F(InitValueManifestTest, InitFromValueInvalid) {
31 Testcase testcases[] = { 34 Testcase testcases[] = {
32 Testcase("init_invalid_version_missing.json", errors::kInvalidVersion), 35 Testcase("init_invalid_version_missing.json", errors::kInvalidVersion),
33 Testcase("init_invalid_version_invalid.json", errors::kInvalidVersion), 36 Testcase("init_invalid_version_invalid.json", errors::kInvalidVersion),
34 Testcase("init_invalid_name_missing.json", errors::kInvalidName), 37 Testcase("init_invalid_name_missing.json", errors::kInvalidName),
35 Testcase("init_invalid_name_invalid.json", errors::kInvalidName), 38 Testcase("init_invalid_name_invalid.json", errors::kInvalidName),
36 Testcase("init_invalid_description_invalid.json", 39 Testcase("init_invalid_description_invalid.json",
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 base::i18n::AdjustStringForLocaleDirection(&localized_name); 159 base::i18n::AdjustStringForLocaleDirection(&localized_name);
157 EXPECT_EQ(localized_name, UTF8ToUTF16(extension->name())); 160 EXPECT_EQ(localized_name, UTF8ToUTF16(extension->name()));
158 161
159 // Reset locale. 162 // Reset locale.
160 #if defined(TOOLKIT_GTK) 163 #if defined(TOOLKIT_GTK)
161 gtk_widget_set_default_direction(gtk_dir); 164 gtk_widget_set_default_direction(gtk_dir);
162 #else 165 #else
163 base::i18n::SetICUDefaultLocale(locale); 166 base::i18n::SetICUDefaultLocale(locale);
164 #endif 167 #endif
165 } 168 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698