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

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

Issue 105473003: Add explicit base namespace to string16 users. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 "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_icon_set.h" 6 #include "chrome/common/extensions/extension_icon_set.h"
7 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" 7 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
8 #include "extensions/common/error_utils.h" 8 #include "extensions/common/error_utils.h"
9 #include "extensions/common/extension_builder.h" 9 #include "extensions/common/extension_builder.h"
10 #include "extensions/common/manifest_constants.h" 10 #include "extensions/common/manifest_constants.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 BrowserActionManifestIcons_InvalidDefaultIcon) { 96 BrowserActionManifestIcons_InvalidDefaultIcon) {
97 scoped_ptr<base::DictionaryValue> manifest_value = DictionaryBuilder() 97 scoped_ptr<base::DictionaryValue> manifest_value = DictionaryBuilder()
98 .Set("name", "Invalid default icon").Set("version", "1.0.0") 98 .Set("name", "Invalid default icon").Set("version", "1.0.0")
99 .Set("manifest_version", 2) 99 .Set("manifest_version", 2)
100 .Set("browser_action", 100 .Set("browser_action",
101 DictionaryBuilder().Set( 101 DictionaryBuilder().Set(
102 "default_icon", 102 "default_icon",
103 DictionaryBuilder().Set("19", std::string()) // Invalid value. 103 DictionaryBuilder().Set("19", std::string()) // Invalid value.
104 .Set("24", "icon24.png").Set("38", "icon38.png"))).Build(); 104 .Set("24", "icon24.png").Set("38", "icon38.png"))).Build();
105 105
106 string16 error = ErrorUtils::FormatErrorMessageUTF16( 106 base::string16 error = ErrorUtils::FormatErrorMessageUTF16(
107 errors::kInvalidIconPath, "19"); 107 errors::kInvalidIconPath, "19");
108 LoadAndExpectError(Manifest(manifest_value.get(), "Invalid default icon"), 108 LoadAndExpectError(Manifest(manifest_value.get(), "Invalid default icon"),
109 errors::kInvalidIconPath); 109 errors::kInvalidIconPath);
110 } 110 }
111 111
112 } // namespace 112 } // namespace
113 } // namespace extensions 113 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698