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 "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" |
(...skipping 12 matching lines...) Expand all Loading... |
23 { "3, 0, 0, 0", "3.0.0.0" }, // Picasa | 23 { "3, 0, 0, 0", "3.0.0.0" }, // Picasa |
24 { "1, 0, 0, 1", "1.0.0.1" }, // Earth | 24 { "1, 0, 0, 1", "1.0.0.1" }, // Earth |
25 { "10,0,45,2", "10.0.45.2" }, // Flash | 25 { "10,0,45,2", "10.0.45.2" }, // Flash |
26 { "10.1 r102", "10.1.102"}, // Flash | 26 { "10.1 r102", "10.1.102"}, // Flash |
27 { "10.3 d180", "10.3.180" }, // Flash (Debug) | 27 { "10.3 d180", "10.3.180" }, // Flash (Debug) |
28 { "11.5.7r609", "11.5.7.609"}, // Shockwave | 28 { "11.5.7r609", "11.5.7.609"}, // Shockwave |
29 { "1.6.0_22", "1.6.0.22"}, // Java | 29 { "1.6.0_22", "1.6.0.22"}, // Java |
30 }; | 30 }; |
31 | 31 |
32 for (size_t i = 0; i < arraysize(versions); i++) { | 32 for (size_t i = 0; i < arraysize(versions); i++) { |
33 scoped_ptr<Version> version(PluginGroup::CreateVersionFromString( | 33 Version version; |
34 ASCIIToUTF16(versions[i][0]))); | 34 PluginGroup::CreateVersionFromString(ASCIIToUTF16(versions[i][0]), |
35 EXPECT_EQ(versions[i][1], version->GetString()); | 35 &version); |
| 36 EXPECT_EQ(versions[i][1], version.GetString()); |
36 } | 37 } |
37 } | 38 } |
38 | 39 |
39 } // namespace npapi | 40 } // namespace npapi |
40 } // namespace webkit | 41 } // namespace webkit |
OLD | NEW |