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

Unified Diff: content/browser/plugin_data_remover_impl.cc

Issue 1144353003: Do not attempt to open a channel to a plugin in Plugin Data Remover if there are no plugins availab… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/plugin_data_remover_impl.cc
diff --git a/content/browser/plugin_data_remover_impl.cc b/content/browser/plugin_data_remover_impl.cc
index 43930ba1de7eb359783b1f0cafcdd7e72dd6bb75..bc87d8e03915abe668a44c0770ed6154b3e59c72 100644
--- a/content/browser/plugin_data_remover_impl.cc
+++ b/content/browser/plugin_data_remover_impl.cc
@@ -91,9 +91,13 @@ class PluginDataRemoverImpl::Context
std::vector<WebPluginInfo> plugins;
plugin_service->GetPluginInfoArray(
GURL(), mime_type, false, &plugins, NULL);
- base::FilePath plugin_path;
- if (!plugins.empty()) // May be empty for some tests.
- plugin_path = plugins[0].path;
+
+ if (plugins.empty()) {
+ // May be empty for some tests and on the CrOS login OOBE screen.
+ OnTimeout();
Bernhard Bauer 2015/05/20 21:48:34 We should probably call this method OnError() now.
Will Harris 2015/05/20 21:52:12 I tried calling OnError() first, but it prints a s
Bernhard Bauer 2015/05/20 21:55:03 Oh, durr. We really only need SignalDone(), so I g
Will Harris 2015/05/20 22:02:59 yes. good plan.
+ return;
+ }
+ base::FilePath plugin_path = plugins[0].path;
DCHECK_CURRENTLY_ON(BrowserThread::IO);
remove_start_time_ = base::Time::Now();
« 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