diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-10 21:13:32 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-10 21:13:32 +0000 |
| commit | 0e863bbdb3f9af2d6912f3ec9f8f86e2f05668bf (patch) | |
| tree | 489dd1985ee4a8e1b51fbd3e2a52219d8562adc1 /content | |
| parent | 7ccb7071077af5e80e50ac0daab7445dee10455a (diff) | |
| download | chromium_src-0e863bbdb3f9af2d6912f3ec9f8f86e2f05668bf.zip chromium_src-0e863bbdb3f9af2d6912f3ec9f8f86e2f05668bf.tar.gz chromium_src-0e863bbdb3f9af2d6912f3ec9f8f86e2f05668bf.tar.bz2 | |
Revert 204994 "Configure networks requiring a certificate."
> Configure networks requiring a certificate.
>
> The current flow does not guarantee that a configured network will have
> its tpm / pkcs11 credentials configured. We need to set these
> properties in order to reliably connect to networks requiring
> certificates. The patch also includes some minor changes to improve
> error reporting and configuration triggering for failure cases.
>
> BUG=247104
> For /wifi_data_provider_chromeos_unittest.cc:
> TBR=joth@chromium.org
>
> Review URL: https://chromiumcodereview.appspot.com/16512003
TBR=stevenjb@chromium.org
Review URL: https://codereview.chromium.org/16109015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205307 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc b/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc index d19e3eb..1cf6e5d 100644 --- a/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc +++ b/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc @@ -21,7 +21,7 @@ class GeolocationChromeOsWifiDataProviderTest : public testing::Test { virtual void SetUp() OVERRIDE { chromeos::DBusThreadManager::InitializeWithStub(); - chromeos::NetworkHandler::InitializeForTest(); + chromeos::NetworkHandler::Initialize(); manager_client_ = chromeos::DBusThreadManager::Get()->GetShillManagerClient(); manager_test_ = manager_client_->GetTestInterface(); |