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

Side by Side Diff: chrome/browser/chromeos/plugin_selection_policy_unittest.cc

Issue 3796011: Merge 62261, 62267, 62265 & 62679... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/552/src/
Patch Set: Created 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chromeos/plugin_selection_policy.cc ('k') | chrome/browser/plugin_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:eol-style
+ LF
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/browser/chromeos/plugin_selection_policy.h" 5 #include "chrome/browser/chromeos/plugin_selection_policy.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 info_vector)); 261 info_vector));
262 EXPECT_EQ(0, policy->FindFirstAllowed(GURL("http://www.foo.com/blah.html"), 262 EXPECT_EQ(0, policy->FindFirstAllowed(GURL("http://www.foo.com/blah.html"),
263 info_vector)); 263 info_vector));
264 EXPECT_EQ(3, policy->FindFirstAllowed(GURL("http://www.bling.com/blah.html"), 264 EXPECT_EQ(3, policy->FindFirstAllowed(GURL("http://www.bling.com/blah.html"),
265 info_vector)); 265 info_vector));
266 EXPECT_EQ(3, policy->FindFirstAllowed(GURL("http://www.google.com/blah.html"), 266 EXPECT_EQ(3, policy->FindFirstAllowed(GURL("http://www.google.com/blah.html"),
267 info_vector)); 267 info_vector));
268 } 268 }
269 269
270 } // namespace chromeos 270 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/plugin_selection_policy.cc ('k') | chrome/browser/plugin_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698