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

Unified Diff: webkit/plugins/npapi/plugin_group_unittest.cc

Issue 10823434: [6] Moves CreateVersionFromString to plugin_utils and updates the callers. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Added missing include <algorithm> Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/plugins/npapi/plugin_group.cc ('k') | webkit/plugins/npapi/plugin_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/npapi/plugin_group_unittest.cc
diff --git a/webkit/plugins/npapi/plugin_group_unittest.cc b/webkit/plugins/npapi/plugin_group_unittest.cc
deleted file mode 100644
index 90b520880566f93d0aada07683f986b2caac4eb1..0000000000000000000000000000000000000000
--- a/webkit/plugins/npapi/plugin_group_unittest.cc
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "webkit/plugins/npapi/plugin_group.h"
-
-#include <string>
-#include <vector>
-
-#include "base/memory/scoped_ptr.h"
-#include "base/utf_string_conversions.h"
-#include "base/version.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace webkit {
-namespace npapi {
-
-TEST(PluginGroupTest, VersionExtraction) {
- // Some real-world plugin versions (spaces, commata, parentheses, 'r', oh my)
- const char* versions[][2] = {
- { "7.6.6 (1671)", "7.6.6.1671" }, // Quicktime
- { "2, 0, 0, 254", "2.0.0.254" }, // DivX
- { "3, 0, 0, 0", "3.0.0.0" }, // Picasa
- { "1, 0, 0, 1", "1.0.0.1" }, // Earth
- { "10,0,45,2", "10.0.45.2" }, // Flash
- { "10.1 r102", "10.1.102"}, // Flash
- { "10.3 d180", "10.3.180" }, // Flash (Debug)
- { "11.5.7r609", "11.5.7.609"}, // Shockwave
- { "1.6.0_22", "1.6.0.22"}, // Java
- { "1.07.00_0005", "1.7.0.5"}, // Java with leading zeros
- { "1..0", "1.0.0" } // Empty version component
- };
-
- for (size_t i = 0; i < arraysize(versions); i++) {
- Version version;
- PluginGroup::CreateVersionFromString(ASCIIToUTF16(versions[i][0]),
- &version);
-
- ASSERT_TRUE(version.IsValid());
- EXPECT_EQ(versions[i][1], version.GetString());
- }
-}
-
-} // namespace npapi
-} // namespace webkit
« no previous file with comments | « webkit/plugins/npapi/plugin_group.cc ('k') | webkit/plugins/npapi/plugin_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698