| OLD | NEW |
| 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/extension_action/page_action_handler.h" |
| 10 #include "chrome/common/extensions/api/i18n/default_locale_handler.h" | 10 #include "chrome/common/extensions/api/i18n/default_locale_handler.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 | 23 |
| 24 namespace errors = extension_manifest_errors; | 24 namespace errors = extension_manifest_errors; |
| 25 namespace keys = extension_manifest_keys; | 25 namespace keys = extension_manifest_keys; |
| 26 | 26 |
| 27 namespace extensions { | 27 namespace extensions { |
| 28 | 28 |
| 29 class InitValueManifestTest : public ExtensionManifestTest { | 29 class InitValueManifestTest : public ExtensionManifestTest { |
| 30 protected: | 30 protected: |
| 31 virtual void SetUp() OVERRIDE { | 31 virtual void SetUp() OVERRIDE { |
| 32 ExtensionManifestTest::SetUp(); | 32 ExtensionManifestTest::SetUp(); |
| 33 ManifestHandler::Register(extension_manifest_keys::kIcons, | 33 (new extensions::DefaultLocaleHandler)->Register(); |
| 34 make_linked_ptr(new IconsHandler)); | 34 (new extensions::IconsHandler)->Register(); |
| 35 extensions::ManifestHandler::Register( | 35 (new extensions::OptionsPageHandler)->Register(); |
| 36 keys::kOptionsPage, | 36 (new extensions::PageActionHandler)->Register(); |
| 37 make_linked_ptr(new extensions::OptionsPageHandler)); | |
| 38 extensions::ManifestHandler::Register( | |
| 39 keys::kDefaultLocale, | |
| 40 make_linked_ptr(new extensions::DefaultLocaleHandler)); | |
| 41 linked_ptr<extensions::PageActionHandler> page_action_handler( | |
| 42 new extensions::PageActionHandler); | |
| 43 extensions::ManifestHandler::Register(keys::kPageAction, page_action_handler); | |
| 44 extensions::ManifestHandler::Register( | |
| 45 keys::kPageActions, page_action_handler); | |
| 46 } | 37 } |
| 47 }; | 38 }; |
| 48 | 39 |
| 49 TEST_F(InitValueManifestTest, InitFromValueInvalid) { | 40 TEST_F(InitValueManifestTest, InitFromValueInvalid) { |
| 50 Testcase testcases[] = { | 41 Testcase testcases[] = { |
| 51 Testcase("init_invalid_version_missing.json", errors::kInvalidVersion), | 42 Testcase("init_invalid_version_missing.json", errors::kInvalidVersion), |
| 52 Testcase("init_invalid_version_invalid.json", errors::kInvalidVersion), | 43 Testcase("init_invalid_version_invalid.json", errors::kInvalidVersion), |
| 53 Testcase("init_invalid_name_missing.json", errors::kInvalidName), | 44 Testcase("init_invalid_name_missing.json", errors::kInvalidName), |
| 54 Testcase("init_invalid_name_invalid.json", errors::kInvalidName), | 45 Testcase("init_invalid_name_invalid.json", errors::kInvalidName), |
| 55 Testcase("init_invalid_description_invalid.json", | 46 Testcase("init_invalid_description_invalid.json", |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 | 168 |
| 178 // Reset locale. | 169 // Reset locale. |
| 179 #if defined(TOOLKIT_GTK) | 170 #if defined(TOOLKIT_GTK) |
| 180 gtk_widget_set_default_direction(gtk_dir); | 171 gtk_widget_set_default_direction(gtk_dir); |
| 181 #else | 172 #else |
| 182 base::i18n::SetICUDefaultLocale(locale); | 173 base::i18n::SetICUDefaultLocale(locale); |
| 183 #endif | 174 #endif |
| 184 } | 175 } |
| 185 | 176 |
| 186 } // namespace extensions | 177 } // namespace extensions |
| OLD | NEW |