Use base::MessageLoopProxy instead of MessageLoop in ProxyConfigServiceLinux.

net/proxy/proxy_config_service_linux.h

 // 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.
 
 #ifndef NET_PROXY_PROXY_CONFIG_SERVICE_LINUX_H_
 #define NET_PROXY_PROXY_CONFIG_SERVICE_LINUX_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/message_loop.h"
 #include "base/observer_list.h"
 #include "net/base/net_export.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_server.h"
 
+class MessageLoopForIO;
+
+namespace base {
+class MessageLoopProxy;
+}  // namespace base
+
 namespace net {
 
 // Implementation of ProxyConfigService that retrieves the system proxy
 // settings from environment variables, gconf, gsettings, or kioslaverc (KDE).
 class NET_EXPORT_PRIVATE ProxyConfigServiceLinux : public ProxyConfigService {
  public:
 
   // Forward declaration of Delegate.
   class Delegate;
 
   class SettingGetter {
    public:
     // Buffer size used in some implementations of this class when reading
     // files. Defined here so unit tests can construct worst-case inputs.
     static const size_t BUFFER_SIZE = 512;
 
     SettingGetter() {}
     virtual ~SettingGetter() {}
 
     // Initializes the class: obtains a gconf/gsettings client, or simulates
     // one, in the concrete implementations. Returns true on success. Must be
     // called before using other methods, and should be called on the thread
     // running the glib main loop.
     // One of |glib_default_loop| and |file_loop| will be used for
     // gconf/gsettings calls or reading necessary files, depending on the
     // implementation.
-    virtual bool Init(MessageLoop* glib_default_loop,
+    virtual bool Init(base::MessageLoopProxy* glib_default_loop,
                       MessageLoopForIO* file_loop) = 0;
 
     // Releases the gconf/gsettings client, which clears cached directories and
     // stops notifications.
     virtual void ShutDown() = 0;
 
     // Requests notification of gconf/gsettings changes for proxy
     // settings. Returns true on success.
     virtual bool SetUpNotifications(Delegate* delegate) = 0;
 
     // Returns the message loop for the thread on which this object
     // handles notifications, and also on which it must be destroyed.
     // Returns NULL if it does not matter.
-    virtual MessageLoop* GetNotificationLoop() = 0;
+    virtual base::MessageLoopProxy* GetNotificationLoop() = 0;
 
     // Returns the data source's name (e.g. "gconf", "gsettings", "KDE",
     // "test"). Used only for diagnostic purposes (e.g. VLOG(1) etc.).
     virtual const char* GetDataSource() = 0;
 
     // These are all the values that can be fetched. We used to just use the
     // corresponding paths in gconf for these, but gconf is now obsolete and
     // in the future we'll be using mostly gsettings/kioslaverc so we
     // enumerate them instead to avoid unnecessary string operations.
     enum StringSetting {
@@ skipping 95 matching lines @@
     Delegate(base::Environment* env_var_getter, SettingGetter* setting_getter);
 
     // Synchronously obtains the proxy configuration. If gconf,
     // gsettings, or kioslaverc are used, also enables notifications for
     // setting changes. gconf/gsettings must only be accessed from the
     // thread running the default glib main loop, and so this method
     // must be called from the UI thread. The message loop for the IO
     // thread is specified so that notifications can post tasks to it
     // (and for assertions). The message loop for the file thread is
     // used to read any files needed to determine proxy settings.
-    void SetUpAndFetchInitialConfig(MessageLoop* glib_default_loop,
-                                    MessageLoop* io_loop,
+    void SetUpAndFetchInitialConfig(base::MessageLoopProxy* glib_default_loop,
+                                    base::MessageLoopProxy* io_loop,
                                     MessageLoopForIO* file_loop);
 
     // Handler for setting change notifications: fetches a new proxy
     // configuration from settings, and if this config is different
     // than what we had before, posts a task to have it stored in
     // cached_config_.
     // Left public for simplicity.
     void OnCheckProxyConfigSettings();
 
     // Called from IO thread.
@@ skipping 56 matching lines @@
     ProxyConfig reference_config_;
 
     // The MessageLoop for the UI thread, aka main browser thread. This thread
     // is where we run the glib main loop (see base/message_pump_glib.h). It is
     // the glib default loop in the sense that it runs the glib default context:
     // as in the context where sources are added by g_timeout_add and
     // g_idle_add, and returned by g_main_context_default. gconf uses glib
     // timeouts and idles and possibly other callbacks that will all be
     // dispatched on this thread. Since gconf is not thread safe, any use of
     // gconf must be done on the thread running this loop.
-    MessageLoop* glib_default_loop_;
+    scoped_refptr<base::MessageLoopProxy> glib_default_loop_;
     // MessageLoop for the IO thread. GetLatestProxyConfig() is called from
     // the thread running this loop.
-    MessageLoop* io_loop_;
+    scoped_refptr<base::MessageLoopProxy> io_loop_;
 
     ObserverList<Observer> observers_;
 
     DISALLOW_COPY_AND_ASSIGN(Delegate);
   };
 
   // Thin wrapper shell around Delegate.
 
   // Usual constructor
   ProxyConfigServiceLinux();
   // For testing: take alternate setting and env var getter implementations.
   explicit ProxyConfigServiceLinux(base::Environment* env_var_getter);
   ProxyConfigServiceLinux(base::Environment* env_var_getter,
                           SettingGetter* setting_getter);
 
   virtual ~ProxyConfigServiceLinux();
 
-  void SetupAndFetchInitialConfig(MessageLoop* glib_default_loop,
-                                  MessageLoop* io_loop,
+  void SetupAndFetchInitialConfig(base::MessageLoopProxy* glib_default_loop,
+                                  base::MessageLoopProxy* io_loop,
                                   MessageLoopForIO* file_loop) {
     delegate_->SetUpAndFetchInitialConfig(glib_default_loop, io_loop,
                                           file_loop);
   }
   void OnCheckProxyConfigSettings() {
     delegate_->OnCheckProxyConfigSettings();
   }
 
   // ProxyConfigService methods:
   // Called from IO thread.
   virtual void AddObserver(Observer* observer) OVERRIDE;
   virtual void RemoveObserver(Observer* observer) OVERRIDE;
   virtual ProxyConfigService::ConfigAvailability GetLatestProxyConfig(
       ProxyConfig* config) OVERRIDE;
 
  private:
   scoped_refptr<Delegate> delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceLinux);
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_PROXY_CONFIG_SERVICE_LINUX_H_