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

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

Issue 15995038: Use a direct include of utf_string_conversions.h in google_apis/, gpu/, ipc/, media/, ppapi/, print… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: better Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « webkit/plugins/npapi/plugin_list_posix.cc ('k') | webkit/plugins/npapi/plugin_stream.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "webkit/plugins/npapi/plugin_list.h" 5 #include "webkit/plugins/npapi/plugin_list.h"
6 6
7 #include "base/string16.h" 7 #include "base/string16.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "webkit/plugins/npapi/mock_plugin_list.h" 10 #include "webkit/plugins/npapi/mock_plugin_list.h"
11 11
12 namespace webkit { 12 namespace webkit {
13 namespace npapi { 13 namespace npapi {
14 14
15 namespace { 15 namespace {
16 16
17 bool Equals(const WebPluginInfo& a, const WebPluginInfo& b) { 17 bool Equals(const WebPluginInfo& a, const WebPluginInfo& b) {
18 return (a.name == b.name && 18 return (a.name == b.name &&
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 "(using IcedTea-Web 1.2 (1.2-2ubuntu0.10.04.2))", 190 "(using IcedTea-Web 1.2 (1.2-2ubuntu0.10.04.2))",
191 &info); 191 &info);
192 EXPECT_EQ(ASCIIToUTF16("1.2"), info.version); 192 EXPECT_EQ(ASCIIToUTF16("1.2"), info.version);
193 } 193 }
194 194
195 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) 195 #endif // defined(OS_POSIX) && !defined(OS_MACOSX)
196 196
197 197
198 } // namespace npapi 198 } // namespace npapi
199 } // namespace webkit 199 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/npapi/plugin_list_posix.cc ('k') | webkit/plugins/npapi/plugin_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698