Improve network stub behavior

chrome/browser/chromeos/cros/network_library_impl_stub.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 "chrome/browser/chromeos/cros/network_library_impl_stub.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "chrome/browser/chromeos/cros/native_network_constants.h"
-#include "chrome/common/chrome_switches.h"
+#include "chromeos/chromeos_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using content::BrowserThread;
 
 namespace {
 
 bool IsEthernetEnabled() {
   return !CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableStubEthernet);
+      chromeos::switches::kDisableStubEthernet);
 }
 
 bool IsInteractive() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableStubInteractive);
+      chromeos::switches::kEnableStubInteractive);
 }
 
 }  // namespace
 
 namespace chromeos {
 
 NetworkLibraryImplStub::NetworkLibraryImplStub()
     : ip_address_("1.1.1.1"),
       hardware_address_("01:23:45:67:89:ab"),
       pin_(""),
@@ skipping 280 matching lines @@
   cellular1->set_activation_state(ACTIVATION_STATE_ACTIVATED);
   cellular1->set_payment_url(std::string("http://www.google.com"));
   cellular1->set_usage_url(std::string("http://www.google.com"));
   cellular1->set_network_technology(NETWORK_TECHNOLOGY_EVDO);
   AddStubNetwork(cellular1, PROFILE_NONE);
 
   CellularNetwork* cellular2 = new CellularNetwork("/cellular2");
   cellular2->set_name("Fake Cellular 2");
   cellular2->set_device_path(cellular->device_path());
   cellular2->set_strength(50);
-  cellular2->set_activation_state(ACTIVATION_STATE_NOT_ACTIVATED);
+  cellular2->set_activation_state(ACTIVATION_STATE_ACTIVATING);
   cellular2->set_network_technology(NETWORK_TECHNOLOGY_UMTS);
   cellular2->set_roaming_state(ROAMING_STATE_ROAMING);
   cellular2->set_payment_url(std::string("http://www.google.com"));
   cellular2->set_usage_url(std::string("http://www.google.com"));
   AddStubNetwork(cellular2, PROFILE_NONE);
 
   CellularNetwork* cellular3 = new CellularNetwork("cellular3");
   cellular3->set_name("Fake Cellular 3 (policy-managed)");
   cellular3->set_device_path(cellular->device_path());
   cellular3->set_activation_state(ACTIVATION_STATE_ACTIVATED);
@@ skipping 467 matching lines @@
   }
   callback.Run(service_path, dictionary.get());
 }
 
 const std::map<std::string, base::DictionaryValue*>&
 NetworkLibraryImplStub::GetConfigurations() {
   return service_configurations_;
 }
 
 }  // namespace chromeos