OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_data_remover.h" | 5 #include "chrome/browser/plugin_data_remover.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/synchronization/waitable_event_watcher.h" | 9 #include "base/synchronization/waitable_event_watcher.h" |
10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
(...skipping 23 matching lines...) Expand all Loading... |
34 #ifdef OS_MACOSX | 34 #ifdef OS_MACOSX |
35 FilePath browser_directory; | 35 FilePath browser_directory; |
36 PathService::Get(chrome::DIR_APP, &browser_directory); | 36 PathService::Get(chrome::DIR_APP, &browser_directory); |
37 command_line->AppendSwitchPath(switches::kExtraPluginDir, | 37 command_line->AppendSwitchPath(switches::kExtraPluginDir, |
38 browser_directory.AppendASCII("plugins")); | 38 browser_directory.AppendASCII("plugins")); |
39 #endif | 39 #endif |
40 } | 40 } |
41 }; | 41 }; |
42 | 42 |
43 IN_PROC_BROWSER_TEST_F(PluginDataRemoverTest, RemoveData) { | 43 IN_PROC_BROWSER_TEST_F(PluginDataRemoverTest, RemoveData) { |
44 scoped_refptr<PluginDataRemover> plugin_data_remover(new PluginDataRemover()); | 44 scoped_refptr<PluginDataRemover> plugin_data_remover( |
| 45 new PluginDataRemover(browser()->profile())); |
45 plugin_data_remover->set_mime_type(kNPAPITestPluginMimeType); | 46 plugin_data_remover->set_mime_type(kNPAPITestPluginMimeType); |
46 base::WaitableEventWatcher watcher; | 47 base::WaitableEventWatcher watcher; |
47 base::WaitableEvent* event = | 48 base::WaitableEvent* event = |
48 plugin_data_remover->StartRemoving(base::Time()); | 49 plugin_data_remover->StartRemoving(base::Time()); |
49 watcher.StartWatching(event, this); | 50 watcher.StartWatching(event, this); |
50 ui_test_utils::RunMessageLoop(); | 51 ui_test_utils::RunMessageLoop(); |
51 } | 52 } |
OLD | NEW |