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

Side by Side Diff: chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc

Issue 23744004: Move the rest of extension_manifest_constants to top-level extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Latest master Created 7 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/api/extension_action/action_info.h" 5 #include "chrome/common/extensions/api/extension_action/action_info.h"
6 #include "chrome/common/extensions/extension_builder.h" 6 #include "chrome/common/extensions/extension_builder.h"
7 #include "chrome/common/extensions/extension_icon_set.h" 7 #include "chrome/common/extensions/extension_icon_set.h"
8 #include "chrome/common/extensions/extension_manifest_constants.h"
9 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" 8 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
10 #include "chrome/common/extensions/value_builder.h" 9 #include "chrome/common/extensions/value_builder.h"
11 #include "extensions/common/error_utils.h" 10 #include "extensions/common/error_utils.h"
11 #include "extensions/common/manifest_constants.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 13
14 namespace errors = extension_manifest_errors; 14 namespace extensions {
15 15
16 namespace extensions { 16 namespace errors = manifest_errors;
17
17 namespace { 18 namespace {
18 19
19 class BrowserActionManifestTest : public ExtensionManifestTest { 20 class BrowserActionManifestTest : public ExtensionManifestTest {
20 }; 21 };
21 22
22 TEST_F(BrowserActionManifestTest, 23 TEST_F(BrowserActionManifestTest,
23 BrowserActionManifestIcons_NoDefaultIcons) { 24 BrowserActionManifestIcons_NoDefaultIcons) {
24 scoped_refptr<const Extension> extension = 25 scoped_refptr<const Extension> extension =
25 ExtensionBuilder() 26 ExtensionBuilder()
26 .SetManifest(DictionaryBuilder() 27 .SetManifest(DictionaryBuilder()
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 .Set("24", "icon24.png").Set("38", "icon38.png"))).Build(); 104 .Set("24", "icon24.png").Set("38", "icon38.png"))).Build();
104 105
105 string16 error = ErrorUtils::FormatErrorMessageUTF16( 106 string16 error = ErrorUtils::FormatErrorMessageUTF16(
106 errors::kInvalidIconPath, "19"); 107 errors::kInvalidIconPath, "19");
107 LoadAndExpectError(Manifest(manifest_value.get(), "Invalid default icon"), 108 LoadAndExpectError(Manifest(manifest_value.get(), "Invalid default icon"),
108 errors::kInvalidIconPath); 109 errors::kInvalidIconPath);
109 } 110 }
110 111
111 } // namespace 112 } // namespace
112 } // namespace extensions 113 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698