Merge FavoriteState into NetworkState

chrome/browser/chromeos/mobile/mobile_activator_unittest.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/mobile/mobile_activator.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/network_handler.h"
@@ skipping 83 matching lines @@
     DBusThreadManager::Shutdown();
   }
 
   void set_activator_state(const MobileActivator::PlanActivationState state) {
     mobile_activator_.state_ = state;
   }
   void set_network_activation_state(const std::string& activation_state) {
     cellular_network_.activation_state_ = activation_state;
   }
   void set_connection_state(const std::string& state) {
+    cellular_network_.visible_ = true;
     cellular_network_.connection_state_ = state;
   }
 
   base::MessageLoop message_loop_;
   NetworkState cellular_network_;
   TestMobileActivator mobile_activator_;
  private:
   DISALLOW_COPY_AND_ASSIGN(MobileActivatorTest);
 };
 
@@ skipping 151 matching lines @@
 TEST_F(MobileActivatorTest, StartAtStart) {
   EXPECT_CALL(mobile_activator_, HasRecentCellularPlanPayment())
       .WillOnce(Return(false));
   EXPECT_CALL(mobile_activator_,
               EvaluateCellularNetwork(Eq(&cellular_network_)));
   mobile_activator_.StartActivation();
   EXPECT_EQ(mobile_activator_.state(), MobileActivator::PLAN_ACTIVATION_START);
 }
 
 }  // namespace chromeos