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

Side by Side Diff: chrome/common/extensions/api/commands/commands_manifest_unittest.cc

Issue 572813002: Refactor ExtensionManifestTest to allow usage in src/extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
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 "chrome/common/extensions/manifest_tests/extension_manifest_test.h" 5 #include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
11 #include "chrome/common/extensions/api/commands/commands_handler.h" 11 #include "chrome/common/extensions/api/commands/commands_handler.h"
12 #include "chrome/common/extensions/features/feature_channel.h" 12 #include "chrome/common/extensions/features/feature_channel.h"
13 #include "extensions/common/manifest_constants.h" 13 #include "extensions/common/manifest_constants.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 15
16 namespace extensions { 16 namespace extensions {
17 17
18 namespace errors = manifest_errors; 18 namespace errors = manifest_errors;
19 19
20 class CommandsManifestTest : public ExtensionManifestTest { 20 class CommandsManifestTest : public ChromeManifestTest {
21 }; 21 };
22 22
23 TEST_F(CommandsManifestTest, CommandManifestSimple) { 23 TEST_F(CommandsManifestTest, CommandManifestSimple) {
24 #if defined(OS_MACOSX) 24 #if defined(OS_MACOSX)
25 int ctrl = ui::EF_COMMAND_DOWN; 25 int ctrl = ui::EF_COMMAND_DOWN;
26 #else 26 #else
27 int ctrl = ui::EF_CONTROL_DOWN; 27 int ctrl = ui::EF_CONTROL_DOWN;
28 #endif 28 #endif
29 29
30 const ui::Accelerator ctrl_f = ui::Accelerator(ui::VKEY_F, ctrl); 30 const ui::Accelerator ctrl_f = ui::Accelerator(ui::VKEY_F, ctrl);
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 scoped_refptr<Extension> extension4 = 108 scoped_refptr<Extension> extension4 =
109 LoadAndExpectSuccess("command_app_global.json"); 109 LoadAndExpectSuccess("command_app_global.json");
110 } 110 }
111 111
112 TEST_F(CommandsManifestTest, CommandManifestShouldNotCountMediaKeys) { 112 TEST_F(CommandsManifestTest, CommandManifestShouldNotCountMediaKeys) {
113 scoped_refptr<Extension> extension = 113 scoped_refptr<Extension> extension =
114 LoadAndExpectSuccess("command_should_not_count_media_keys.json"); 114 LoadAndExpectSuccess("command_should_not_count_media_keys.json");
115 } 115 }
116 116
117 } // namespace extensions 117 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698