Annotate a third-party leak in SettingGetterImplGSettings::LoadAndCheckVersion().

net/proxy/proxy_config_service_linux.cc

 // Copyright (c) 2012 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 "net/proxy/proxy_config_service_linux.h"
 
 // glib >=2.40 deprecate g_settings_list_schemas in favor of
 // g_settings_schema_source_list_schemas. This function is not available on
 // earlier versions that we still need to support (specifically, 2.32), so
 // disable the warning.
@@ skipping 10 matching lines @@
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/inotify.h>
 #include <unistd.h>
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
+#include "base/debug/leak_annotations.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/nix/xdg_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_tokenizer.h"
@@ skipping 767 matching lines @@
     base::ThreadRestrictions::ScopedAllowIO allow_io;
 
     // Try also without .0 at the end; on some systems this may be required.
     if (!libgio_loader_.Load("libgio-2.0.so.0") &&
         !libgio_loader_.Load("libgio-2.0.so")) {
       VLOG(1) << "Cannot load gio library. Will fall back to gconf.";
       return false;
     }
   }
 
-  GSettings* client;
-  if (!SchemaExists("org.gnome.system.proxy") ||
-      !(client = libgio_loader_.g_settings_new("org.gnome.system.proxy"))) {
+  GSettings* client = NULL;
+  if (SchemaExists("org.gnome.system.proxy")) {

[rvargas (doing something else), 2014/06/06 02:14:42]

nit: there are 4 uses of this string in this file. Do you mind moving it to a
constant on the anon namespace above?

[earthdok, 2014/06/06 13:00:38]

Done.

+    ANNOTATE_SCOPED_MEMORY_LEAK; // http://crbug.com/380782
+    client = libgio_loader_.g_settings_new("org.gnome.system.proxy");
+  }
+  if (!client) {
     VLOG(1) << "Cannot create gsettings client. Will fall back to gconf.";
     return false;
   }
   g_object_unref(client);
 
   std::string path;
   if (!env->GetVar("PATH", &path)) {
     LOG(ERROR) << "No $PATH variable. Assuming no gnome-network-properties.";
   } else {
     // Yes, we're on the UI thread. Yes, we're accessing the file system.
@@ skipping 936 matching lines @@
 void ProxyConfigServiceLinux::RemoveObserver(Observer* observer) {
   delegate_->RemoveObserver(observer);
 }
 
 ProxyConfigService::ConfigAvailability
     ProxyConfigServiceLinux::GetLatestProxyConfig(ProxyConfig* config) {
   return delegate_->GetLatestProxyConfig(config);
 }
 
 }  // namespace net