Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / browser / android / content_view_statics.cc

diff --git a/src/content/browser/android/content_view_statics.cc b/src/content/browser/android/content_view_statics.cc
index 00b5600..1c4e903 100644 (file)
--- a/src/content/browser/android/content_view_statics.cc
+++ b/src/content/browser/android/content_view_statics.cc
@@ -32,7 +32,7 @@ namespace {
 // This tracks the renderer processes that received a suspend request. It's
 // important on resume to only resume the renderer processes that were actually
 // suspended as opposed to all the current renderer processes because the
-// suspend calls are refcounted within WebKitPlatformSupport and it expects a
+// suspend calls are refcounted within BlinkPlatformImpl and it expects a
 // perfectly matched number of resume calls.
 // Note that this class is only accessed from the UI thread.
 class SuspendedProcessWatcher : public content::RenderProcessHostObserver {
@@ -41,14 +41,13 @@ class SuspendedProcessWatcher : public content::RenderProcessHostObserver {
   // If the process crashes, stop watching the corresponding RenderProcessHost
   // and ensure it doesn't get over-resumed.
   virtual void RenderProcessExited(content::RenderProcessHost* host,
-                                   base::ProcessHandle handle,
                                    base::TerminationStatus status,
-                                   int exit_code) OVERRIDE {
+                                   int exit_code) override {
     StopWatching(host);
   }
 
   virtual void RenderProcessHostDestroyed(
-      content::RenderProcessHost* host) OVERRIDE {
+      content::RenderProcessHost* host) override {
     StopWatching(host);
   }
 
@@ -84,7 +83,7 @@ class SuspendedProcessWatcher : public content::RenderProcessHostObserver {
     std::vector<int>::iterator pos = std::find(suspended_processes_.begin(),
                                                suspended_processes_.end(),
                                                host->GetID());
-    DCHECK_NE(pos, suspended_processes_.end());
+    DCHECK(pos != suspended_processes_.end());
     host->RemoveObserver(this);
     suspended_processes_.erase(pos);
   }