OLD | NEW |
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 "chrome/browser/plugin_prefs.h" | 5 #include "chrome/browser/plugins/plugin_prefs.h" |
6 | 6 |
7 #include "base/at_exit.h" | 7 #include "base/at_exit.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
11 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
13 #include "chrome/common/chrome_constants.h" | 13 #include "chrome/common/chrome_constants.h" |
14 #include "chrome/common/chrome_paths.h" | 14 #include "chrome/common/chrome_paths.h" |
15 #include "content/public/browser/plugin_service.h" | 15 #include "content/public/browser/plugin_service.h" |
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
247 EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(bundled_plugin)); | 247 EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(bundled_plugin)); |
248 | 248 |
249 EnablePluginSynchronously(true, bundled_plugin.path, true); | 249 EnablePluginSynchronously(true, bundled_plugin.path, true); |
250 EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_1)); | 250 EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_1)); |
251 EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_2)); | 251 EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_2)); |
252 EXPECT_TRUE(plugin_prefs_->IsPluginEnabled(bundled_plugin)); | 252 EXPECT_TRUE(plugin_prefs_->IsPluginEnabled(bundled_plugin)); |
253 | 253 |
254 plugin_prefs_->SetPluginListForTesting(NULL); | 254 plugin_prefs_->SetPluginListForTesting(NULL); |
255 PluginService::GetInstance()->SetPluginListForTesting(NULL); | 255 PluginService::GetInstance()->SetPluginListForTesting(NULL); |
256 } | 256 } |
OLD | NEW |