Remove gconf usage from atk_util_auralinux

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>
 
 #include "base/bind.h"
+#include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
+#include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
 #include "base/task_runner.h"
 #include "ui/accessibility/platform/atk_util_auralinux.h"
 #include "ui/accessibility/platform/ax_platform_node_auralinux.h"
 
 namespace {
 
 typedef void (*gnome_accessibility_module_init)();
 
+const char kAccessibilityEnabled[] = "ACCESSIBILITY_ENABLED";
+const char kAtkBridgeModule[] = "gail:atk-bridge";
 const char kAtkBridgePath[] = "gtk-2.0/modules/libatk-bridge.so";
 const char kAtkBridgeSymbolName[] = "gnome_accessibility_module_init";
+const char kGtkModules[] = "GTK_MODULES";
 
 gnome_accessibility_module_init g_accessibility_module_init = nullptr;
 
 bool AccessibilityModuleInitOnFileThread() {
   // Try to load libatk-bridge.so.
   base::FilePath atk_bridge_path(ATK_LIB_DIR);
   atk_bridge_path = atk_bridge_path.Append(kAtkBridgePath);
   GModule* bridge = g_module_open(atk_bridge_path.value().c_str(),
                                   static_cast<GModuleFlags>(0));
   if (!bridge) {
     VLOG(1) << "Unable to open module " << atk_bridge_path.value();
     return false;
   }
 
   if (!g_module_symbol(bridge, kAtkBridgeSymbolName,
                       (gpointer *)&g_accessibility_module_init)) {
     VLOG(1) << "Unable to get symbol pointer from " << atk_bridge_path.value();
     // Just to make sure it's null;
     g_accessibility_module_init = nullptr;
     return false;
   }
 
   return true;
 }
 
-#if defined(USE_GCONF)
+bool PlatformShouldEnableAccessibility() {
+  std::unique_ptr<base::Environment> env(base::Environment::Create());
+  std::string gtk_modules;
+  if (!env->GetVar(kGtkModules, &gtk_modules))
+    return false;
 
-const char kAccessibilityEnabled[] = "ACCESSIBILITY_ENABLED";
-const char kGnomeAccessibilityEnabledKey[] =
-    "/desktop/gnome/interface/accessibility";
-
-bool PlatformShouldEnableAccessibility() {
-  GConfClient* client = gconf_client_get_default();
-  if (!client) {
-    LOG(ERROR) << "gconf_client_get_default failed";
-    return false;
+  for (const std::string& module :
+       base::SplitString(gtk_modules, base::kWhitespaceASCII,
+                         base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) {
+    if (module == kAtkBridgeModule)
+      return true;
   }
-
-  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() {
-#if defined(USE_GCONF)
   char* enable_accessibility = getenv(kAccessibilityEnabled);
   if ((enable_accessibility && atoi(enable_accessibility) == 1) ||
       PlatformShouldEnableAccessibility())
     return true;
-#endif  // defined(USE_GCONF)
-
   return false;
 }
 
 }  // namespace
 
 G_BEGIN_DECLS
 
 //
 // atk_util_auralinux AtkObject definition and implementation.
 //
@@ skipping 70 matching lines @@
 // AtkUtilAuraLinuxClass implementation.
 //
 
 namespace ui {
 
 // static
 AtkUtilAuraLinux* AtkUtilAuraLinux::GetInstance() {
   return base::Singleton<AtkUtilAuraLinux>::get();
 }
 
-#if defined(USE_GCONF)
-
-AtkUtilAuraLinux::AtkUtilAuraLinux()
-    : is_enabled_(false) {
-}
-
-#else
-
-AtkUtilAuraLinux::AtkUtilAuraLinux() {
-}
-
-#endif // defined(USE_GCONF)
+AtkUtilAuraLinux::AtkUtilAuraLinux() : is_enabled_(false) {}
 
 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() {
   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