Remove remaining references to gconf

This change should be a no-op. It is mostly comment changes, with a few
code changes removing unused enum values and a settings provider class
(which was accidentally added back in after I removed it previously).

Bug: 768027
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Ia26788b970fbaa6c25eda9cce7758ad626e587b3
Reviewed-on: https://chromium-review.googlesource.com/822160Reviewed-by: Will Harris <wfh@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Tim Brown <timbrown@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523899}

chrome/browser/net/proxy_service_factory.cc

@@ -19,7 +19,7 @@ using content::BrowserThread;
 // static
 std::unique_ptr<net::ProxyConfigService>
 ProxyServiceFactory::CreateProxyConfigService(PrefProxyConfigTracker* tracker) {
-  // The linux gconf-based proxy settings getter relies on being initialized
+  // The linux gsettings-based proxy settings getter relies on being initialized
   // from the UI thread.
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 

chrome/browser/ui/libgtkui/gtk_util.h

@@ -80,7 +80,7 @@ void ClearAuraTransientParent(GtkWidget* dialog);
 // Parses |button_string| into |leading_buttons| and
 // |trailing_buttons|.  The string is of the format
 // "<button>*:<button*>", for example, "close:minimize:maximize".
-// This format is used by GTK3 settings and several gconf settings.
+// This format is used by GTK3 settings and gsettings.
 void ParseButtonLayout(const std::string& button_string,
                        std::vector<views::FrameButton>* leading_buttons,
                        std::vector<views::FrameButton>* trailing_buttons);

chrome/browser/ui/libgtkui/settings_provider.h

@@ -10,7 +10,7 @@
 
 namespace libgtkui {
 
-// This class is just a switch between SettingsProviderGconf and
+// This class is just a switch between SettingsProviderGSettings and
 // SettingsProviderGtk3.  Currently, it is empty and it's only purpose is so
 // that GtkUi can store just a std::unique_ptr<SettingsProvider> and not have to
 // have the two impls each guarded by their own macros.
@@ -20,7 +20,7 @@ class SettingsProvider {
 
  protected:
   // Even though this class is not pure virtual, it should not be instantiated
-  // directly.  Use SettingsProviderGconf or SettingsProviderGtk3 instead.
+  // directly.  Use SettingsProviderGSettings or SettingsProviderGtk3 instead.
   SettingsProvider() {}
 };
 

chrome/browser/ui/libgtkui/settings_provider_gconf.cc

-// Copyright 2014 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/ui/libgtkui/settings_provider_gconf.h"
-
-#include <gtk/gtk.h>
-
-#include <memory>
-
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/environment.h"
-#include "base/nix/xdg_util.h"
-#include "chrome/browser/ui/libgtkui/gtk_ui.h"
-#include "chrome/browser/ui/libgtkui/gtk_util.h"
-#include "ui/base/x/x11_util.h"
-#include "ui/views/window/frame_buttons.h"
-
-namespace {
-
-// The GConf key we read for the button placement string. Even through the key
-// has "metacity" in it, it's shared between metacity and compiz.
-const char kButtonLayoutKey[] = "/apps/metacity/general/button_layout";
-
-// The GConf key we read for what to do in case of middle clicks on non client
-// area. Even through the key has "metacity" in it, it's shared between
-// metacity and compiz.
-const char kMiddleClickActionKey[] =
-    "/apps/metacity/general/action_middle_click_titlebar";
-
-// GConf requires us to subscribe to a parent directory before we can subscribe
-// to changes in an individual key in that directory.
-const char kMetacityGeneral[] = "/apps/metacity/general";
-
-const char kDefaultButtonString[] = ":minimize,maximize,close";
-
-}  // namespace
-
-namespace libgtkui {
-
-// Public interface:
-
-SettingsProviderGconf::SettingsProviderGconf(GtkUi* delegate)
-    : delegate_(delegate), client_(nullptr) {
-  std::unique_ptr<base::Environment> env(base::Environment::Create());
-  base::nix::DesktopEnvironment de =
-      base::nix::GetDesktopEnvironment(env.get());
-  if (de == base::nix::DESKTOP_ENVIRONMENT_GNOME ||
-      de == base::nix::DESKTOP_ENVIRONMENT_UNITY ||
-      ui::GuessWindowManager() == ui::WM_METACITY) {
-    client_ = gconf_client_get_default();
-    // If we fail to get a context, that's OK, since we'll just fallback on
-    // not receiving gconf keys.
-    if (client_) {
-      // Register that we're interested in the values of this directory.
-      GError* error = nullptr;
-      gconf_client_add_dir(client_, kMetacityGeneral,
-                           GCONF_CLIENT_PRELOAD_ONELEVEL, &error);
-      if (HandleGError(error, kMetacityGeneral))
-        return;
-
-      // Get the initial value of the keys we're interested in.
-      GetAndRegister(
-          kButtonLayoutKey,
-          base::BindOnce(&SettingsProviderGconf::ParseAndStoreButtonValue,
-                         base::Unretained(this)));
-      GetAndRegister(
-          kMiddleClickActionKey,
-          base::BindOnce(&SettingsProviderGconf::ParseAndStoreMiddleClickValue,
-                         base::Unretained(this)));
-    }
-  }
-}
-
-SettingsProviderGconf::~SettingsProviderGconf() {}
-
-// Private:
-
-void SettingsProviderGconf::GetAndRegister(
-    const char* key_to_subscribe,
-    base::OnceCallback<void(GConfValue*)> initial_setter) {
-  GError* error = nullptr;
-  GConfValue* gconf_value = gconf_client_get(client_, key_to_subscribe, &error);
-  if (HandleGError(error, key_to_subscribe))
-    return;
-  std::move(initial_setter).Run(gconf_value);
-  if (gconf_value)
-    gconf_value_free(gconf_value);
-
-  // Register to get notifies about changes to this key.
-  gconf_client_notify_add(
-      client_, key_to_subscribe,
-      reinterpret_cast<void (*)(GConfClient*, guint, GConfEntry*, void*)>(
-          OnChangeNotificationThunk),
-      this, nullptr, &error);
-  if (HandleGError(error, key_to_subscribe))
-    return;
-}
-
-void SettingsProviderGconf::OnChangeNotification(GConfClient* client,
-                                                 guint cnxn_id,
-                                                 GConfEntry* entry) {
-  if (strcmp(gconf_entry_get_key(entry), kButtonLayoutKey) == 0) {
-    GConfValue* gconf_value = gconf_entry_get_value(entry);
-    ParseAndStoreButtonValue(gconf_value);
-  } else if (strcmp(gconf_entry_get_key(entry), kMiddleClickActionKey) == 0) {
-    GConfValue* gconf_value = gconf_entry_get_value(entry);
-    ParseAndStoreMiddleClickValue(gconf_value);
-  }
-}
-
-bool SettingsProviderGconf::HandleGError(GError* error, const char* key) {
-  if (error != nullptr) {
-    LOG(ERROR) << "Error with gconf key '" << key << "': " << error->message;
-    g_error_free(error);
-    g_object_unref(client_);
-    client_ = nullptr;
-    return true;
-  }
-  return false;
-}
-
-void SettingsProviderGconf::ParseAndStoreButtonValue(GConfValue* gconf_value) {
-  std::string button_string;
-  if (gconf_value) {
-    const char* value = gconf_value_get_string(gconf_value);
-    button_string = value ? value : kDefaultButtonString;
-  } else {
-    button_string = kDefaultButtonString;
-  }
-
-  std::vector<views::FrameButton> leading_buttons;
-  std::vector<views::FrameButton> trailing_buttons;
-  ParseButtonLayout(button_string, &leading_buttons, &trailing_buttons);
-  delegate_->SetWindowButtonOrdering(leading_buttons, trailing_buttons);
-}
-
-void SettingsProviderGconf::ParseAndStoreMiddleClickValue(
-    GConfValue* gconf_value) {
-  GtkUi::NonClientWindowFrameAction action =
-      views::LinuxUI::WINDOW_FRAME_ACTION_LOWER;
-  if (gconf_value) {
-    const char* value = gconf_value_get_string(gconf_value);
-
-    if (strcmp(value, "none") == 0) {
-      action = views::LinuxUI::WINDOW_FRAME_ACTION_NONE;
-    } else if (strcmp(value, "lower") == 0) {
-      action = views::LinuxUI::WINDOW_FRAME_ACTION_LOWER;
-    } else if (strcmp(value, "minimize") == 0) {
-      action = views::LinuxUI::WINDOW_FRAME_ACTION_MINIMIZE;
-    } else if (strcmp(value, "toggle-maximize") == 0) {
-      action = views::LinuxUI::WINDOW_FRAME_ACTION_TOGGLE_MAXIMIZE;
-    } else if (strcmp(value, "menu") == 0) {
-      action = views::LinuxUI::WINDOW_FRAME_ACTION_MENU;
-    } else {
-      // While we want to have the default state be lower if there isn't a
-      // value, we want to default to no action if the user has explicitly
-      // chose an action that we don't implement.
-      action = views::LinuxUI::WINDOW_FRAME_ACTION_NONE;
-    }
-  }
-
-  delegate_->SetNonClientWindowFrameAction(
-      views::LinuxUI::WINDOW_FRAME_ACTION_SOURCE_MIDDLE_CLICK, action);
-}
-
-}  // namespace libgtkui

chrome/browser/ui/libgtkui/settings_provider_gconf.h

-// Copyright 2014 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.
-
-#ifndef CHROME_BROWSER_UI_LIBGTKUI_SETTINGS_PROVIDER_GCONF_H_
-#define CHROME_BROWSER_UI_LIBGTKUI_SETTINGS_PROVIDER_GCONF_H_
-
-#include <gconf/gconf-client.h>
-#include <gtk/gtk.h>
-
-#include <set>
-#include <string>
-
-#include "base/callback_forward.h"
-#include "base/macros.h"
-#include "chrome/browser/ui/libgtkui/gtk_signal.h"
-#include "chrome/browser/ui/libgtkui/settings_provider.h"
-
-namespace libgtkui {
-class GtkUi;
-
-// On GNOME desktops, subscribes to the gconf key which controlls button order.
-// Everywhere else, SetTiltebarButtons() just calls back into BrowserTitlebar
-// with the default ordering.
-class SettingsProviderGconf : public SettingsProvider {
- public:
-  // Sends data to the GtkUi when available.
-  explicit SettingsProviderGconf(GtkUi* delegate);
-  ~SettingsProviderGconf() override;
-
- private:
-  // Called whenever the metacity key changes.
-  CHROMEG_CALLBACK_2(SettingsProviderGconf,
-                     void,
-                     OnChangeNotification,
-                     GConfClient*,
-                     guint,
-                     GConfEntry*);
-
-  void GetAndRegister(const char* key_to_subscribe,
-                      base::OnceCallback<void(GConfValue*)> initial_setter);
-
-  // Checks |error|. On error, prints out a message and closes the connection
-  // to GConf and reverts to default mode.
-  bool HandleGError(GError* error, const char* key);
-
-  // Parses the return data structure from GConf, falling back to the default
-  // value on any error.
-  void ParseAndStoreButtonValue(GConfValue* gconf_value);
-  void ParseAndStoreMiddleClickValue(GConfValue* gconf_value);
-
-  GtkUi* delegate_;
-
-  // Pointer to our gconf context. nullptr if we aren't on a desktop that uses
-  // gconf.
-  GConfClient* client_;
-
-  DISALLOW_COPY_AND_ASSIGN(SettingsProviderGconf);
-};
-
-}  // namespace libgtkui
-
-#endif  // CHROME_BROWSER_UI_LIBGTKUI_SETTINGS_PROVIDER_GCONF_H_

chrome/service/service_process.cc

@@ -148,10 +148,10 @@ bool ServiceProcess::Initialize(base::MessageLoopForUI* message_loop,
 #if defined(USE_GLIB)
   // g_type_init has been deprecated since version 2.35.
 #if !GLIB_CHECK_VERSION(2, 35, 0)
-  // GLib type system initialization is needed for gconf.
+  // Unclear if still needed, but harmless so keeping.
   g_type_init();
 #endif
-#endif  // defined(OS_LINUX) || defined(OS_OPENBSD)
+#endif  // defined(USE_GLIB)
   main_message_loop_ = message_loop;
   service_process_state_.reset(state);
 

content/browser/BUILD.gn

@@ -1989,10 +1989,6 @@ jumbo_source_set("browser") {
 
     configs += [ "//build/config/linux/atk" ]
 
-    if (use_gconf) {
-      configs += [ "//build/config/linux/gconf" ]
-    }
-
     if (use_glib) {
       configs += [ "//build/config/linux:glib" ]
     }

content/browser/browser_main_loop.cc

@@ -641,11 +641,9 @@ void BrowserMainLoop::EarlyInitialization() {
   // version for 2.36, hence do not call g_type_init starting 2.35.
   // http://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g-type-init
 #if !GLIB_CHECK_VERSION(2, 35, 0)
-  // GLib type system initialization. Needed at least for gconf,
-  // used in net/proxy/proxy_config_service_linux.cc. Most likely
-  // this is superfluous as gtk_init() ought to do this. It's
-  // definitely harmless, so retained as a reminder of this
-  // requirement for gconf.
+  // GLib type system initialization. It's unclear if it's still required for
+  // any remaining code. Most likely this is superfluous as gtk_init() ought
+  // to do this. It's definitely harmless, so it's retained here.
   g_type_init();
 #endif  // !GLIB_CHECK_VERSION(2, 35, 0)
 

content/public/common/proxy_config.mojom

@@ -41,7 +41,6 @@ enum ProxyConfigSource {
   PROXY_CONFIG_SOURCE_UNKNOWN,
   PROXY_CONFIG_SOURCE_SYSTEM,
   PROXY_CONFIG_SOURCE_SYSTEM_FAILED,
-  PROXY_CONFIG_SOURCE_GCONF,
   PROXY_CONFIG_SOURCE_GSETTINGS,
   PROXY_CONFIG_SOURCE_KDE,
   PROXY_CONFIG_SOURCE_ENV,

content/public/common/proxy_config_traits.cc

@@ -116,8 +116,6 @@ EnumTraits<content::mojom::ProxyConfigSource, net::ProxyConfigSource>::ToMojom(
     case net::PROXY_CONFIG_SOURCE_SYSTEM_FAILED:
       return content::mojom::ProxyConfigSource::
           PROXY_CONFIG_SOURCE_SYSTEM_FAILED;
-    case net::PROXY_CONFIG_SOURCE_GCONF:
-      return content::mojom::ProxyConfigSource::PROXY_CONFIG_SOURCE_GCONF;
     case net::PROXY_CONFIG_SOURCE_GSETTINGS:
       return content::mojom::ProxyConfigSource::PROXY_CONFIG_SOURCE_GSETTINGS;
     case net::PROXY_CONFIG_SOURCE_KDE:
@@ -147,9 +145,6 @@ bool EnumTraits<content::mojom::ProxyConfigSource, net::ProxyConfigSource>::
     case content::mojom::ProxyConfigSource::PROXY_CONFIG_SOURCE_SYSTEM_FAILED:
       *out = net::PROXY_CONFIG_SOURCE_SYSTEM_FAILED;
       return true;
-    case content::mojom::ProxyConfigSource::PROXY_CONFIG_SOURCE_GCONF:
-      *out = net::PROXY_CONFIG_SOURCE_GCONF;
-      return true;
     case content::mojom::ProxyConfigSource::PROXY_CONFIG_SOURCE_GSETTINGS:
       *out = net::PROXY_CONFIG_SOURCE_GSETTINGS;
       return true;

content/public/common/proxy_config_traits_unittest.cc

@@ -36,7 +36,8 @@ TEST(ProxyConfigTraitsTest, AutoDetect) {
 TEST(ProxyConfigTraitsTest, Direct) {
   net::ProxyConfig proxy_config = net::ProxyConfig::CreateDirect();
   proxy_config.set_id(2);
-  proxy_config.set_source(net::ProxyConfigSource::PROXY_CONFIG_SOURCE_GCONF);
+  proxy_config.set_source(
+      net::ProxyConfigSource::PROXY_CONFIG_SOURCE_GSETTINGS);
   EXPECT_TRUE(TestProxyConfigRoundTrip(proxy_config));
 }
 

ios/chrome/browser/browser_state/chrome_browser_state_io_data.h

@@ -163,7 +163,7 @@ class ChromeBrowserStateIOData {
     scoped_refptr<net::SSLConfigService> ssl_config_service;
 
     // We need to initialize the ProxyConfigService from the UI thread
-    // because on linux it relies on initializing things through gconf,
+    // because on linux it relies on initializing things through gsettings,
     // and needs to be on the main thread.
     std::unique_ptr<net::ProxyConfigService> proxy_config_service;
 

net/proxy/proxy_config_service_linux_unittest.cc

@@ -58,12 +58,12 @@ struct EnvVarValues {
 #undef TRUE
 #undef FALSE
 
-// So as to distinguish between an unset gconf boolean variable and
+// So as to distinguish between an unset boolean variable and
 // one that is false.
 enum BoolSettingValue { UNSET = 0, TRUE, FALSE };
 
-// Set of values for all gconf settings that we might query.
-struct GConfValues {
+// Set of values for all gsettings settings that we might query.
+struct GSettingsValues {
   // strings
   const char* mode;
   const char* autoconfig_url;
@@ -85,7 +85,7 @@ struct GConfValues {
 };
 
 // Mapping from a setting name to the location of the corresponding
-// value (inside a EnvVarValues or GConfValues struct).
+// value (inside a EnvVarValues or GSettingsValues struct).
 template <typename key_type, typename value_type>
 struct SettingsTable {
   typedef std::map<key_type, value_type*> map_type;
@@ -192,7 +192,7 @@ class MockSettingGetter : public ProxyConfigServiceLinux::SettingGetter {
 
   // Zeros all environment values.
   void Reset() {
-    GConfValues zero_values = {0};
+    GSettingsValues zero_values = {0};
     values = zero_values;
   }
 
@@ -259,7 +259,7 @@ class MockSettingGetter : public ProxyConfigServiceLinux::SettingGetter {
   bool MatchHostsUsingSuffixMatching() override { return false; }
 
   // Intentionally public, for convenience when setting up a test.
-  GConfValues values;
+  GSettingsValues values;
 
  private:
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
@@ -302,7 +302,7 @@ class SyncConfigGetter : public ProxyConfigService::Observer {
     Wait();
   }
 
-  // Does gconf setup and initial fetch of the proxy config,
+  // Does gsettings setup and initial fetch of the proxy config,
   // all on the calling thread (meant to be the thread with the
   // default glib main loop, which is the glib thread).
   void SetupAndInitialFetch() {
@@ -449,7 +449,7 @@ class ProxyConfigServiceLinuxTest : public PlatformTest {
 // Builds an identifier for each test in an array.
 #define TEST_DESC(desc) base::StringPrintf("at line %d <%s>", __LINE__, desc)
 
-TEST_F(ProxyConfigServiceLinuxTest, BasicGConfTest) {
+TEST_F(ProxyConfigServiceLinuxTest, BasicGSettingsTest) {
   std::vector<std::string> empty_ignores;
 
   std::vector<std::string> google_ignores;
@@ -462,7 +462,7 @@ TEST_F(ProxyConfigServiceLinuxTest, BasicGConfTest) {
     std::string description;
 
     // Input.
-    GConfValues values;
+    GSettingsValues values;
 
     // Expected outputs (availability and fields of ProxyConfig).
     ProxyConfigService::ConfigAvailability availability;
@@ -1099,7 +1099,7 @@ TEST_F(ProxyConfigServiceLinuxTest, BasicEnvTest) {
   }
 }
 
-TEST_F(ProxyConfigServiceLinuxTest, GconfNotification) {
+TEST_F(ProxyConfigServiceLinuxTest, GSettingsNotification) {
   std::unique_ptr<MockEnvironment> env(new MockEnvironment);
   MockSettingGetter* setting_getter = new MockSettingGetter;
   ProxyConfigServiceLinux* service =

net/proxy/proxy_config_source.cc

@@ -14,7 +14,6 @@ const char* const kSourceNames[] = {
   "UNKNOWN",
   "SYSTEM",
   "SYSTEM FAILED",
-  "GCONF",
   "GSETTINGS",
   "KDE",
   "ENV",

net/proxy/proxy_config_source.h

@@ -17,7 +17,6 @@ enum ProxyConfigSource {
   PROXY_CONFIG_SOURCE_SYSTEM,        // System settings (Win/Mac).
   PROXY_CONFIG_SOURCE_SYSTEM_FAILED, // Default settings after failure to
                                      // determine system settings.
-  PROXY_CONFIG_SOURCE_GCONF,         // GConf (Linux)
   PROXY_CONFIG_SOURCE_GSETTINGS,     // GSettings (Linux).
   PROXY_CONFIG_SOURCE_KDE,           // KDE (Linux).
   PROXY_CONFIG_SOURCE_ENV,           // Environment variables.

net/proxy/proxy_service.cc

@@ -1502,7 +1502,7 @@ ProxyService::CreateSystemProxyConfigService(
 
   // Assume we got called on the thread that runs the default glib
   // main loop, so the current thread is where we should be running
-  // gconf calls from.
+  // gsettings calls from.
   scoped_refptr<base::SingleThreadTaskRunner> glib_thread_task_runner =
       base::ThreadTaskRunnerHandle::Get();