Modify WaitableEvent::Wait() to return void

chrome/browser/plugin_data_remover.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/plugin_data_remover.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
@@ skipping 53 matching lines @@
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&PluginDataRemover::OnTimeout, this),
       kRemovalTimeoutMs);
 
   return event_.get();
 }
 
 void PluginDataRemover::Wait() {
   base::Time start_time(base::Time::Now());
-  bool result = true;
   if (is_removing_)
-    result = event_->Wait();
+    event_->Wait();
   UMA_HISTOGRAM_TIMES("ClearPluginData.wait_at_shutdown",
                       base::Time::Now() - start_time);
   UMA_HISTOGRAM_TIMES("ClearPluginData.time_at_shutdown",
                       base::Time::Now() - remove_start_time_);
-  DCHECK(result) << "Error waiting for plugin process";
 }
 
 int PluginDataRemover::ID() {
   // Generate a unique identifier for this PluginProcessHostClient.
   return ChildProcessInfo::GenerateChildProcessUniqueId();
 }
 
 bool PluginDataRemover::OffTheRecord() {
   return false;
 }
@@ skipping 101 matching lines @@
       webkit::npapi::PluginGroup::CreateVersionFromString(plugin->version));
   scoped_ptr<Version> min_version(Version::GetVersionFromString(
       CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kMinClearSiteDataFlashVersion)));
   if (!min_version.get())
     min_version.reset(Version::GetVersionFromString(kMinFlashVersion));
   return plugin_prefs->IsPluginEnabled(*plugin) &&
          version.get() &&
          min_version->CompareTo(*version) == -1;
 }