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

Side by Side Diff: chrome/browser/chrome_plugin_browsertest.cc

Issue 669273002: Remove Netflix from the check list in ChromePluginTest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « no previous file | no next file » | 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 <vector> 5 #include <vector>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 // Verify that the official builds have the known set of plugins. 249 // Verify that the official builds have the known set of plugins.
250 IN_PROC_BROWSER_TEST_F(ChromePluginTest, InstalledPlugins) { 250 IN_PROC_BROWSER_TEST_F(ChromePluginTest, InstalledPlugins) {
251 const char* expected[] = { 251 const char* expected[] = {
252 "Chrome PDF Viewer", 252 "Chrome PDF Viewer",
253 "Shockwave Flash", 253 "Shockwave Flash",
254 "Native Client", 254 "Native Client",
255 "Chrome Remote Desktop Viewer", 255 "Chrome Remote Desktop Viewer",
256 #if defined(OS_CHROMEOS) 256 #if defined(OS_CHROMEOS)
257 "Google Talk Plugin", 257 "Google Talk Plugin",
258 "Google Talk Plugin Video Accelerator", 258 "Google Talk Plugin Video Accelerator",
259 "Netflix",
260 #endif 259 #endif
261 }; 260 };
262 261
263 std::vector<content::WebPluginInfo> plugins = GetPlugins(); 262 std::vector<content::WebPluginInfo> plugins = GetPlugins();
264 for (size_t i = 0; i < arraysize(expected); ++i) { 263 for (size_t i = 0; i < arraysize(expected); ++i) {
265 size_t j = 0; 264 size_t j = 0;
266 for (; j < plugins.size(); ++j) { 265 for (; j < plugins.size(); ++j) {
267 if (plugins[j].name == base::ASCIIToUTF16(expected[i])) 266 if (plugins[j].name == base::ASCIIToUTF16(expected[i]))
268 break; 267 break;
269 } 268 }
270 ASSERT_TRUE(j != plugins.size()) << "Didn't find " << expected[i]; 269 ASSERT_TRUE(j != plugins.size()) << "Didn't find " << expected[i];
271 } 270 }
272 } 271 }
273 #endif 272 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698