Added flags to prevent messing with network connections while 3G device is be...

chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc

 // Copyright (c) 2006-2010 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/dom_ui/mobile_setup_ui.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 44 matching lines @@
 const char kErrorBadConnectionActivated[] = "bad_connection_activated";
 const char kErrorRoamingOnConnection[] = "roaming_connection";
 const char kErrorNoEVDO[] = "no_evdo";
 const char kErrorRoamingActivation[] = "roaming_activation";
 const char kErrorRoamingPartiallyActivated[] = "roaming_partially_activated";
 const char kErrorNoService[] = "no_service";
 const char kErrorDisabled[] = "disabled";
 const char kErrorNoDevice[] = "no_device";
 const char kFailedPaymentError[] = "failed_payment";
 const char kFailedConnectivity[] = "connectivity";
+const char kErrorAlreadyRunning[] = "already_running";
 
 // Cellular configuration file path.
 const char kCellularConfigPath[] =
     "/usr/share/chromeos-assets/mobile/mobile_config.json";
 
 // Cellular config file field names.
 const char kVersionField[] = "version";
 const char kErrorsField[] = "errors";
 
 // Number of times we will retry to restart the activation process in case
@@ skipping 227 matching lines @@
   TabContents* tab_contents_;
   // Internal handler state.
   PlanActivationState state_;
   std::string service_path_;
   // Flags that control if wifi and ethernet connection needs to be restored
   // after the activation of cellular network.
   bool reenable_wifi_;
   bool reenable_ethernet_;
   bool reenable_cert_check_;
   bool evaluating_;
+  // True if we think that another tab is already running activation.
+  bool already_running_;
   // Connection retry counter.
   int connection_retry_count_;
   // Post payment reconnect wait counters.
   int reconnect_wait_count_;
   // Activation retry attempt count;
   int activation_attempt_;
   // Connection start time.
   base::Time connection_start_time_;
   // Timer that monitors reconnection timeouts.
   base::RepeatingTimer<MobileSetupHandler> reconnect_timer_;
@@ skipping 109 matching lines @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 MobileSetupHandler::MobileSetupHandler(const std::string& service_path)
     : tab_contents_(NULL),
       state_(PLAN_ACTIVATION_PAGE_LOADING),
       service_path_(service_path),
       reenable_wifi_(false),
       reenable_ethernet_(false),
       reenable_cert_check_(false),
       evaluating_(false),
+      already_running_(false),
       connection_retry_count_(0),
       reconnect_wait_count_(0),
       activation_attempt_(0) {
 }
 
 MobileSetupHandler::~MobileSetupHandler() {
   reconnect_timer_.Stop();
   chromeos::NetworkLibrary* lib =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
+  if (lib->IsLocked())

[Charlie Lee, 2011/01/20 20:05:43]

probably want to remove network manager observer before calling unlock since
unlock will trigger a network manager changed event.

[zel, 2011/01/20 22:06:14]

Done.

+    lib->Unlock();
   lib->RemoveNetworkManagerObserver(this);
   lib->RemoveObserverForAllNetworks(this);
   ReEnableOtherConnections();
 }
 
 DOMMessageHandler* MobileSetupHandler::Attach(DOMUI* dom_ui) {
   return DOMMessageHandler::Attach(dom_ui);
 }
 
 void MobileSetupHandler::Init(TabContents* contents) {
   tab_contents_ = contents;
   LoadCellularConfig();
-  SetupActivationProcess(GetCellularNetwork(service_path_));
+  if (!chromeos::CrosLibrary::Get()->GetNetworkLibrary()->IsLocked())

[Charlie Lee, 2011/01/20 20:05:43]

if we are using locked only for network activation. maybe we should rename it to
that instead. that way we won't use the lock/unlock for something else that
wants to lock down the network library.

[zel, 2011/01/20 22:06:14]

Actually, I wanted to keep this generic at least from API side. Ideally, we
should be able to solve activation problems with flimflam communication channels
instead of locking, but there are other cases where we might want to freeze
operations that enable/disable particular types of connections.

+    SetupActivationProcess(GetCellularNetwork(service_path_));
+  else
+    already_running_ = true;
 }
 
 void MobileSetupHandler::RegisterMessages() {
   dom_ui_->RegisterMessageCallback(kJsApiStartActivation,
       NewCallback(this, &MobileSetupHandler::HandleStartActivation));
   dom_ui_->RegisterMessageCallback(kJsApiSetTransactionStatus,
       NewCallback(this, &MobileSetupHandler::HandleSetTransactionStatus));
 }
 
 void MobileSetupHandler::OnNetworkManagerChanged(
@@ skipping 38 matching lines @@
 void MobileSetupHandler::InitiateActivation() {
   scoped_refptr<TaskProxy> task = new TaskProxy(AsWeakPtr(), 0);
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(task.get(), &TaskProxy::HandleStartActivation));
 }
 
 void MobileSetupHandler::StartActivation() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   chromeos::NetworkLibrary* lib =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
-
   chromeos::CellularNetwork* network = GetCellularNetwork(service_path_);
   // Check if we can start activation process.
-  if (!network) {
-    std::string error(kErrorNoService);
-    if (!lib->cellular_available())
+  if (!network || already_running_) {
+    std::string error;
+    if (already_running_)
+      error = kErrorAlreadyRunning;
+    else if (!lib->cellular_available())
       error = kErrorNoDevice;
     else if (!lib->cellular_enabled())
       error = kErrorDisabled;
+    else
+      error = kErrorNoService;
     ChangeState(NULL, PLAN_ACTIVATION_ERROR, GetErrorMessage(error));
     return;
   }
 
   // Start monitoring network property changes.
   lib->AddNetworkManagerObserver(this);
   lib->RemoveObserverForAllNetworks(this);
   lib->AddNetworkObserver(network->service_path(), this);
   // Try to start with OTASP immediately if we have received payment recently.
   state_ = lib->HasRecentCellularPlanPayment() ?
@@ skipping 461 matching lines @@
   }
   return "UNKNOWN";
 }
 
 
 void MobileSetupHandler::CompleteActivation(
     chromeos::CellularNetwork* network) {
   // Remove observers, we are done with this page.
   chromeos::NetworkLibrary* lib = chromeos::CrosLibrary::Get()->
       GetNetworkLibrary();
+  lib->Unlock();

[Charlie Lee, 2011/01/20 20:05:43]

same here. move this below remove network manager observer?

[zel, 2011/01/20 22:06:14]

Done.

   // If we have successfully activated the connection, set autoconnect flag.
   if (network) {
     network->set_auto_connect(true);
     lib->SaveCellularNetwork(network);
   }
   lib->RemoveNetworkManagerObserver(this);
   lib->RemoveObserverForAllNetworks(this);
   // Reactivate other types of connections if we have
   // shut them down previously.
   ReEnableOtherConnections();
@@ skipping 135 matching lines @@
     reenable_cert_check_ = true;
     prefs->SetBoolean(prefs::kCertRevocationCheckingEnabled, false);
   }
 
   chromeos::NetworkLibrary* lib = chromeos::CrosLibrary::Get()->
       GetNetworkLibrary();
   // Disable autoconnect to cellular network.
   network->set_auto_connect(false);
   lib->SaveCellularNetwork(network);
 
+  // Prevent any other network interference.
   DisableOtherNetworks();
+  lib->Lock();
 }
 
 void MobileSetupHandler::DisableOtherNetworks() {
   chromeos::NetworkLibrary* lib = chromeos::CrosLibrary::Get()->
       GetNetworkLibrary();
   // Disable ethernet and wifi.
   if (lib->ethernet_enabled()) {
     reenable_ethernet_ = true;
     lib->EnableEthernetNetworkDevice(false);
   }
@@ skipping 101 matching lines @@
       new MobileSetupUIHTMLSource(service_path);
 
   // Set up the chrome://mobilesetup/ source.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           ChromeURLDataManager::GetInstance(),
           &ChromeURLDataManager::AddDataSource,
           make_scoped_refptr(html_source)));
 }