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

Side by Side Diff: chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm

Issue 5699005: Policy: Re-enabled plugin still disabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Whitespace fixes only. Trybot happiness still applies. Created 9 years, 11 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/resources/plugins.html ('k') | chrome/renderer/render_view.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) 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 #import "chrome/browser/ui/cocoa/table_model_array_controller.h" 5 #import "chrome/browser/ui/cocoa/table_model_array_controller.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/mock_plugin_exceptions_table_model.h" 10 #include "chrome/browser/mock_plugin_exceptions_table_model.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 CONTENT_SETTINGS_TYPE_PLUGINS, 47 CONTENT_SETTINGS_TYPE_PLUGINS,
48 "b-bar", 48 "b-bar",
49 CONTENT_SETTING_ALLOW); 49 CONTENT_SETTING_ALLOW);
50 50
51 model_.reset(new MockPluginExceptionsTableModel(map, NULL)); 51 model_.reset(new MockPluginExceptionsTableModel(map, NULL));
52 52
53 std::vector<webkit::npapi::PluginGroup> plugins; 53 std::vector<webkit::npapi::PluginGroup> plugins;
54 webkit::npapi::WebPluginInfo foo_plugin; 54 webkit::npapi::WebPluginInfo foo_plugin;
55 foo_plugin.path = FilePath(FILE_PATH_LITERAL("a-foo")); 55 foo_plugin.path = FilePath(FILE_PATH_LITERAL("a-foo"));
56 foo_plugin.name = ASCIIToUTF16("FooPlugin"); 56 foo_plugin.name = ASCIIToUTF16("FooPlugin");
57 foo_plugin.enabled = true; 57 foo_plugin.enabled =
58 webkit::npapi::WebPluginInfo::USER_ENABLED_POLICY_UNMANAGED;
58 scoped_ptr<webkit::npapi::PluginGroup> foo_group( 59 scoped_ptr<webkit::npapi::PluginGroup> foo_group(
59 webkit::npapi::PluginGroup::FromWebPluginInfo(foo_plugin)); 60 webkit::npapi::PluginGroup::FromWebPluginInfo(foo_plugin));
60 plugins.push_back(*foo_group); 61 plugins.push_back(*foo_group);
61 webkit::npapi::WebPluginInfo bar_plugin; 62 webkit::npapi::WebPluginInfo bar_plugin;
62 bar_plugin.path = FilePath(FILE_PATH_LITERAL("b-bar")); 63 bar_plugin.path = FilePath(FILE_PATH_LITERAL("b-bar"));
63 bar_plugin.name = ASCIIToUTF16("BarPlugin"); 64 bar_plugin.name = ASCIIToUTF16("BarPlugin");
64 bar_plugin.enabled = true; 65 bar_plugin.enabled =
66 webkit::npapi::WebPluginInfo::USER_ENABLED_POLICY_UNMANAGED;
65 scoped_ptr<webkit::npapi::PluginGroup> bar_group( 67 scoped_ptr<webkit::npapi::PluginGroup> bar_group(
66 webkit::npapi::PluginGroup::FromWebPluginInfo(bar_plugin)); 68 webkit::npapi::PluginGroup::FromWebPluginInfo(bar_plugin));
67 plugins.push_back(*bar_group); 69 plugins.push_back(*bar_group);
68 webkit::npapi::WebPluginInfo blurp_plugin; 70 webkit::npapi::WebPluginInfo blurp_plugin;
69 blurp_plugin.path = FilePath(FILE_PATH_LITERAL("c-blurp")); 71 blurp_plugin.path = FilePath(FILE_PATH_LITERAL("c-blurp"));
70 blurp_plugin.name = ASCIIToUTF16("BlurpPlugin"); 72 blurp_plugin.name = ASCIIToUTF16("BlurpPlugin");
71 blurp_plugin.enabled = true; 73 blurp_plugin.enabled =
74 webkit::npapi::WebPluginInfo::USER_ENABLED_POLICY_UNMANAGED;
72 scoped_ptr<webkit::npapi::PluginGroup> blurp_group( 75 scoped_ptr<webkit::npapi::PluginGroup> blurp_group(
73 webkit::npapi::PluginGroup::FromWebPluginInfo(blurp_plugin)); 76 webkit::npapi::PluginGroup::FromWebPluginInfo(blurp_plugin));
74 plugins.push_back(*blurp_group); 77 plugins.push_back(*blurp_group);
75 78
76 model_->set_plugins(plugins); 79 model_->set_plugins(plugins);
77 model_->LoadSettings(); 80 model_->LoadSettings();
78 81
79 id content = [NSMutableArray array]; 82 id content = [NSMutableArray array];
80 controller_.reset( 83 controller_.reset(
81 [[TableModelArrayController alloc] initWithContent:content]); 84 [[TableModelArrayController alloc] initWithContent:content]);
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 [controller remove:nil]; 166 [controller remove:nil];
164 titles = [[controller arrangedObjects] valueForKey:@"title"]; 167 titles = [[controller arrangedObjects] valueForKey:@"title"];
165 EXPECT_NSEQ(@"(\n" 168 EXPECT_NSEQ(@"(\n"
166 @" BarPlugin,\n" 169 @" BarPlugin,\n"
167 @" \"[*.]example.com\",\n" 170 @" \"[*.]example.com\",\n"
168 @" \"[*.]moose.org\"\n" 171 @" \"[*.]moose.org\"\n"
169 @")", 172 @")",
170 [titles description]); 173 [titles description]);
171 } 174 }
172 175
OLDNEW
« no previous file with comments | « chrome/browser/resources/plugins.html ('k') | chrome/renderer/render_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698