Applied review comments from oshima for CL 7850026.

chrome/browser/screensaver_window_finder_gtk.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/screensaver_window_finder_linux.h"
+#include "chrome/browser/screensaver_window_finder_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
 #include "base/basictypes.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "ui/base/x/x11_util.h"
 
 
 ScreensaverWindowFinder::ScreensaverWindowFinder()
     : exists_(false) {
 }
 
 bool ScreensaverWindowFinder::ScreensaverWindowExists() {
-#if defined(USE_AURA)
-  return false;
-#else
   gdk_error_trap_push();
   ScreensaverWindowFinder finder;
   gtk_util::EnumerateTopLevelWindows(&finder);
   bool got_error = gdk_error_trap_pop();
   return finder.exists_ && !got_error;
-#endif
 }
 
 bool ScreensaverWindowFinder::ShouldStopIterating(XID window) {
   if (!ui::IsWindowVisible(window) || !IsScreensaverWindow(window))
     return false;
   exists_ = true;
   return true;
 }
 
 bool ScreensaverWindowFinder::IsScreensaverWindow(XID window) const {
   // It should occupy the full screen.
   if (!ui::IsX11WindowFullScreen(window))
     return false;
 
   // For xscreensaver, the window should have _SCREENSAVER_VERSION property.
   if (ui::PropertyExists(window, "_SCREENSAVER_VERSION"))
     return true;
 
   // For all others, like gnome-screensaver, the window's WM_CLASS property
   // should contain "screensaver".
   std::string value;
   if (!ui::GetStringProperty(window, "WM_CLASS", &value))
     return false;
 
   return value.find("screensaver") != std::string::npos;
 }