Simplify threading in browser thread by making only ChromeThread deal with di...

chrome/browser/chromeos/cros_network_library.cc

 // Copyright (c) 2009 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/chromeos/cros_network_library.h"
 
 #include <algorithm>
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/chromeos/cros_library.h"
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 template <>
 struct RunnableMethodTraits<CrosNetworkLibrary> {
   void RetainCallee(CrosNetworkLibrary* obj) {}
   void ReleaseCallee(CrosNetworkLibrary* obj) {}
 };
 
 CrosNetworkLibrary::CrosNetworkLibrary() {
-  if (CrosLibrary::loaded()) {
-    MessageLoop* loop = ChromeThread::GetMessageLoop(ChromeThread::FILE);
-    if (loop) {
-      loop->PostTask(FROM_HERE, NewRunnableMethod(this,
-          &CrosNetworkLibrary::InitOnBackgroundThread));
-    }
-  }
+  if (!CrosLibrary::loaded())
+    return;
+
+  ChromeThread::PostTask(
+      ChromeThread::FILE, FROM_HERE,
+      NewRunnableMethod(this, &CrosNetworkLibrary::InitOnBackgroundThread));
 }
 
 CrosNetworkLibrary::~CrosNetworkLibrary() {
   if (CrosLibrary::loaded()) {
     // FILE thread is already gone by the time we get to this destructor.
     // So it's ok to just make the disconnect call on the main thread.
     chromeos::DisconnectNetworkStatus(network_status_connection_);
   }
 }
 
@@ skipping 24 matching lines @@
     case chromeos::WEP:
       return "wep";
     case chromeos::WPA:
       return "wpa";
   }
   return "none";
 }
 
 void CrosNetworkLibrary::ConnectToWifiNetwork(WifiNetwork network,
                                               const string16& password) {
-  if (CrosLibrary::loaded()) {
-    MessageLoop* loop = ChromeThread::GetMessageLoop(ChromeThread::FILE);
-    if (loop)
-      loop->PostTask(FROM_HERE, NewRunnableFunction(
+  if (!CrosLibrary::loaded())
+    return;
+
+  ChromeThread::PostTask(
+      ChromeThread::FILE, FROM_HERE,
+      NewRunnableFunction(
           &chromeos::ConnectToWifiNetwork,
           network.ssid.c_str(),
           password.empty() ? NULL : UTF16ToUTF8(password).c_str(),
           GetEncryptionString(network.encryption)));
-  }
 }
 
 // static
 void CrosNetworkLibrary::NetworkStatusChangedHandler(void* object,
     const chromeos::ServiceStatus& service_status) {
   CrosNetworkLibrary* network = static_cast<CrosNetworkLibrary*>(object);
   WifiNetworkVector networks;
   bool ethernet_connected;
   ParseNetworks(service_status, &networks, &ethernet_connected);
   network->UpdateNetworkStatus(networks, ethernet_connected);
@@ skipping 39 matching lines @@
     chromeos::FreeServiceStatus(service_status);
   }
   network_status_connection_ = chromeos::MonitorNetworkStatus(
       &NetworkStatusChangedHandler, this);
 }
 
 void CrosNetworkLibrary::UpdateNetworkStatus(
     const WifiNetworkVector& networks, bool ethernet_connected) {
   // Make sure we run on UI thread.
   if (!ChromeThread::CurrentlyOn(ChromeThread::UI)) {
-    MessageLoop* loop = ChromeThread::GetMessageLoop(ChromeThread::UI);
-    if (loop)
-      loop->PostTask(FROM_HERE, NewRunnableMethod(this,
-          &CrosNetworkLibrary::UpdateNetworkStatus, networks,
-          ethernet_connected));
+    ChromeThread::PostTask(
+        ChromeThread::UI, FROM_HERE,
+        NewRunnableMethod(this,
+            &CrosNetworkLibrary::UpdateNetworkStatus, networks,
+            ethernet_connected));
     return;
   }
 
   ethernet_connected_ = ethernet_connected;
   wifi_networks_ = networks;
   // Sort the list of wifi networks by ssid.
   std::sort(wifi_networks_.begin(), wifi_networks_.end());
   wifi_ = WifiNetwork();
   for (size_t i = 0; i < wifi_networks_.size(); i++) {
     if (wifi_networks_[i].connecting || wifi_networks_[i].connected) {
       wifi_ = wifi_networks_[i];
       break;  // There is only one connected or connecting wifi network.
     }
   }
   FOR_EACH_OBSERVER(Observer, observers_, NetworkChanged(this));
 }