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

Side by Side Diff: webkit/plugins/npapi/plugin_group_unittest.cc

Issue 8687002: Cleanup: Convert ASCIIToUTF16("") to string16(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "webkit/plugins/npapi/plugin_group.h" 5 #include "webkit/plugins/npapi/plugin_group.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/string16.h"
11 #include "base/string_util.h" 12 #include "base/string_util.h"
12 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
13 #include "base/values.h" 14 #include "base/values.h"
14 #include "base/version.h" 15 #include "base/version.h"
15 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
16 #include "webkit/plugins/webplugininfo.h" 17 #include "webkit/plugins/webplugininfo.h"
17 18
18 namespace webkit { 19 namespace webkit {
19 namespace npapi { 20 namespace npapi {
20 21
(...skipping 30 matching lines...) Expand all
51 kPluginDef, 52 kPluginDef,
52 kPluginDef3, 53 kPluginDef3,
53 kPluginDef4, 54 kPluginDef4,
54 kPluginDef34, 55 kPluginDef34,
55 kPluginDefNotVulnerable, 56 kPluginDefNotVulnerable,
56 }; 57 };
57 58
58 // name, path, version, desc. 59 // name, path, version, desc.
59 static const WebPluginInfo kPluginNoVersion = WebPluginInfo( 60 static const WebPluginInfo kPluginNoVersion = WebPluginInfo(
60 ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.2.0.43")), 61 ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.2.0.43")),
61 ASCIIToUTF16(""), ASCIIToUTF16("MyPlugin version 2.0.43")); 62 string16(), ASCIIToUTF16("MyPlugin version 2.0.43"));
62 static const WebPluginInfo kPlugin2043 = WebPluginInfo( 63 static const WebPluginInfo kPlugin2043 = WebPluginInfo(
63 ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.2.0.43")), 64 ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.2.0.43")),
64 ASCIIToUTF16("2.0.43"), ASCIIToUTF16("MyPlugin version 2.0.43")); 65 ASCIIToUTF16("2.0.43"), ASCIIToUTF16("MyPlugin version 2.0.43"));
65 static const WebPluginInfo kPlugin3043 = WebPluginInfo( 66 static const WebPluginInfo kPlugin3043 = WebPluginInfo(
66 ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.3.0.43")), 67 ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.3.0.43")),
67 ASCIIToUTF16("3.0.43"), ASCIIToUTF16("MyPlugin version 3.0.43")); 68 ASCIIToUTF16("3.0.43"), ASCIIToUTF16("MyPlugin version 3.0.43"));
68 static const WebPluginInfo kPlugin3044 = WebPluginInfo( 69 static const WebPluginInfo kPlugin3044 = WebPluginInfo(
69 ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.3.0.44")), 70 ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.3.0.44")),
70 ASCIIToUTF16("3.0.44"), ASCIIToUTF16("MyPlugin version 3.0.44")); 71 ASCIIToUTF16("3.0.44"), ASCIIToUTF16("MyPlugin version 3.0.44"));
71 static const WebPluginInfo kPlugin3045 = WebPluginInfo( 72 static const WebPluginInfo kPlugin3045 = WebPluginInfo(
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 ASCIIToUTF16("4.0.50917.0"), 186 ASCIIToUTF16("4.0.50917.0"),
186 ASCIIToUTF16("silverlight 4")); 187 ASCIIToUTF16("silverlight 4"));
187 group.reset(PluginGroupTest::CreatePluginGroup(silverlight_plugin_def)); 188 group.reset(PluginGroupTest::CreatePluginGroup(silverlight_plugin_def));
188 group->AddPlugin(silverlight_plugin); 189 group->AddPlugin(silverlight_plugin);
189 EXPECT_FALSE(PluginGroup(*group).IsVulnerable(silverlight_plugin)); 190 EXPECT_FALSE(PluginGroup(*group).IsVulnerable(silverlight_plugin));
190 EXPECT_TRUE(PluginGroup(*group).RequiresAuthorization(silverlight_plugin)); 191 EXPECT_TRUE(PluginGroup(*group).RequiresAuthorization(silverlight_plugin));
191 } 192 }
192 193
193 } // namespace npapi 194 } // namespace npapi
194 } // namespace webkit 195 } // namespace webkit
OLDNEW
« no previous file with comments | « ui/views/controls/textfield/textfield_views_model_unittest.cc ('k') | webkit/plugins/npapi/plugin_list_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698