diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-20 00:10:10 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-20 00:10:10 +0000 |
| commit | c088429f95d80542698e8d42ba6d2cce6c92d526 (patch) | |
| tree | 5ff0a721d5f7270417e7007b7bcc7380dc5e7913 /chromeos/dbus | |
| parent | 403e2bc9aaa547df934dc81aa90021424023277d (diff) | |
| download | chromium_src-c088429f95d80542698e8d42ba6d2cce6c92d526.zip chromium_src-c088429f95d80542698e8d42ba6d2cce6c92d526.tar.gz chromium_src-c088429f95d80542698e8d42ba6d2cce6c92d526.tar.bz2 | |
Revert 200968 "NetworkPortalDetector/NetworkStateInformer: Switc..."
Recurring interactive_ui_tests failure on debug CrOS bot:
ScreenLockerTest.TestBasic:
[19220:19220:0518/024626:1396652721:FATAL:webui_screen_locker.cc(208)] Check failed: false.
chromeos::WebUIScreenLocker::IsSigninInProgress()
chromeos::WebUILoginDisplay::IsSigninInProgress()
chromeos::SigninScreenHandler::UpdateStateInternal()
chromeos::SigninScreenHandler::UpdateState()
chromeos::NetworkStateInformer::SendStateToObservers()
chromeos::NetworkStateInformer::UpdateStateAndNotify()
> NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler
>
> This removes the direct network library dependency for NetworkPortalDetector,
> NetworkStateInformer, and SigninScreenHandler. UpdateScreen and
> LocallyManagedUserCreationHandler no longer depend on NetworkLibrary as well.
>
> Also change active -> default network in these to be consistent with
> terminology we use in NetworkStateHandler.
>
> BUG=189093,189009
>
> Review URL: https://chromiumcodereview.appspot.com/14134007
TBR=gauravsh@chromium.org
Review URL: https://codereview.chromium.org/15421003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201004 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus')
| -rw-r--r-- | chromeos/dbus/shill_service_client_stub.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/chromeos/dbus/shill_service_client_stub.cc b/chromeos/dbus/shill_service_client_stub.cc index d4e131d..af4245c 100644 --- a/chromeos/dbus/shill_service_client_stub.cc +++ b/chromeos/dbus/shill_service_client_stub.cc @@ -106,13 +106,10 @@ void ShillServiceClientStub::SetProperty(const dbus::ObjectPath& service_path, return; } if (name == flimflam::kStateProperty) { - // If the service went into a connected state, then move it to the top of - // the list in the manager client. - // TODO(gauravsh): Generalize to sort services properly to allow for testing - // more complex scenarios. + // If we connect to a service, then we move it to the top of the list in + // the manager client. std::string state; - if (value.GetAsString(&state) && (state == flimflam::kStateOnline || - state == flimflam::kStatePortal)) { + if (value.GetAsString(&state) && state == flimflam::kStateOnline) { ShillManagerClient* manager_client = DBusThreadManager::Get()->GetShillManagerClient(); manager_client->GetTestInterface()->MoveServiceToIndex( |