Revert "Revert of Fix hanging on browser shutdown. (patchset #1 id:1 of https://codereview.chromium…

ui/accessibility/platform/atk_util_auralinux.cc

 // Copyright 2015 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 <atk/atk.h>
 #if defined(USE_GCONF)
 #include <gconf/gconf-client.h>
 #endif
 #include <glib-2.0/gmodule.h>
 
@@ skipping 35 matching lines @@
 
   return true;
 }
 
 #if defined(USE_GCONF)
 
 const char kAccessibilityEnabled[] = "ACCESSIBILITY_ENABLED";
 const char kGnomeAccessibilityEnabledKey[] =
     "/desktop/gnome/interface/accessibility";
 
-#endif
+bool PlatformShouldEnableAccessibility() {
+  GConfClient* client = gconf_client_get_default();
+  if (!client) {
+    LOG(ERROR) << "gconf_client_get_default failed";
+    return false;
+  }
+
+  GError* error = nullptr;
+  gboolean value = gconf_client_get_bool(client,
+                                         kGnomeAccessibilityEnabledKey,
+                                         &error);
+  g_object_unref(client);
+
+  if (error) {
+    VLOG(1) << "gconf_client_get_bool failed";
+    g_error_free(error);
+    return false;
+  }
+
+  return value;
+}
+
+#else  // !defined(USE_GCONF)
+
+bool PlatformShouldEnableAccessibility() {
+  // TODO(iceman): implement this for non-GNOME desktops.
+  return false;
+}
+
+#endif  // defined(USE_GCONF)
+
+bool ShouldEnableAccessibility() {
+  char* enable_accessibility = getenv(kAccessibilityEnabled);
+  if ((enable_accessibility && atoi(enable_accessibility) == 1) ||
+      PlatformShouldEnableAccessibility())
+    return true;
+
+  return false;
+}
 
 }  // namespace
 
 G_BEGIN_DECLS
 
 //
 // atk_util_auralinux AtkObject definition and implementation.
 //
 
 #define ATK_UTIL_AURALINUX_TYPE (atk_util_auralinux_get_type())
@@ skipping 87 matching lines @@
 }
 
 #endif // defined(USE_GCONF)
 
 void AtkUtilAuraLinux::Initialize(
     scoped_refptr<base::TaskRunner> init_task_runner) {
 
   // Register our util class.
   g_type_class_unref(g_type_class_ref(ATK_UTIL_AURALINUX_TYPE));
 
+  if (!ShouldEnableAccessibility())
+    return;
+
   init_task_runner->PostTaskAndReply(
       FROM_HERE,
       base::Bind(
           &AtkUtilAuraLinux::CheckIfAccessibilityIsEnabledOnFileThread,
           base::Unretained(this)),
       base::Bind(
           &AtkUtilAuraLinux::FinishAccessibilityInitOnUIThread,
           base::Unretained(this)));
 }
 
 AtkUtilAuraLinux::~AtkUtilAuraLinux() {
 }
 
 #if defined(USE_GCONF)
 
 void AtkUtilAuraLinux::CheckIfAccessibilityIsEnabledOnFileThread() {
-  char* enable_accessibility = getenv(kAccessibilityEnabled);
-  if ((enable_accessibility && atoi(enable_accessibility) == 1) ||
-      CheckPlatformAccessibilitySupportOnFileThread())
-    is_enabled_ = AccessibilityModuleInitOnFileThread();
-}
-
-bool AtkUtilAuraLinux::CheckPlatformAccessibilitySupportOnFileThread() {
-  GConfClient* client = gconf_client_get_default();
-  if (!client) {
-    LOG(ERROR) << "gconf_client_get_default failed";
-    return false;
-  }
-
-  GError* error = nullptr;
-  bool is_enabled = gconf_client_get_bool(client,
-                                    kGnomeAccessibilityEnabledKey,
-                                    &error);
-
-  g_object_unref(client);
-
-  if (error) {
-    VLOG(1) << "gconf_client_get_bool failed";
-    g_error_free(error);
-    return false;
-  }
-
-  return is_enabled;
+  is_enabled_ = AccessibilityModuleInitOnFileThread();
 }
 
 void AtkUtilAuraLinux::FinishAccessibilityInitOnUIThread() {
   if (!is_enabled_) {
     VLOG(1) << "Will not enable ATK accessibility support.";
     return;
   }
 
   DCHECK(g_accessibility_module_init);
   g_accessibility_module_init();
 }
 
 #else
 
 void AtkUtilAuraLinux::CheckIfAccessibilityIsEnabledOnFileThread() {
 }
 
 void AtkUtilAuraLinux::FinishAccessibilityInitOnUIThread() {
 }
 
 #endif // defined(USE_GCONF)
 
 }  // namespace ui