| Index: chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc
|
| index 3ec65f4ca7ea640b0beaa957b99dab6c8818a825..21596db08a60cc0aadec6e5106f1cfd0fe5bbfa5 100644
|
| --- a/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc
|
| +++ b/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc
|
| @@ -9,6 +9,9 @@
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/chromeos/login/helper.h"
|
| #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
|
| +#include "chrome/browser/extensions/api/networking_private/networking_private_chromeos.h"
|
| +#include "chrome/browser/extensions/api/networking_private/networking_private_credentials_getter.h"
|
| +#include "chrome/browser/extensions/api/networking_private/networking_private_delegate_factory.h"
|
| #include "chrome/browser/extensions/extension_apitest.h"
|
| #include "chromeos/chromeos_switches.h"
|
| #include "chromeos/dbus/cryptohome_client.h"
|
| @@ -61,6 +64,10 @@ using chromeos::ShillManagerClient;
|
| using chromeos::ShillProfileClient;
|
| using chromeos::ShillServiceClient;
|
|
|
| +using extensions::NetworkingPrivateDelegate;
|
| +using extensions::NetworkingPrivateDelegateFactory;
|
| +using extensions::NetworkingPrivateChromeOS;
|
| +
|
| namespace {
|
|
|
| const char kUser1ProfilePath[] = "/profile/user1/shill";
|
| @@ -68,6 +75,33 @@ const char kWifiDevicePath[] = "/device/stub_wifi_device1";
|
| const char kCellularDevicePath[] = "/device/stub_cellular_device1";
|
| const char kIPConfigPath[] = "/ipconfig/ipconfig1";
|
|
|
| +// Stub Verify* methods implementation to satisfy expectations of
|
| +// networking_private_apitest.
|
| +class CryptoVerifyStub : public NetworkingPrivateDelegate::VerifyDelegate {
|
| + void VerifyDestination(
|
| + const VerificationProperties& verification_properties,
|
| + const BoolCallback& success_callback,
|
| + const FailureCallback& failure_callback) override {
|
| + success_callback.Run(true);
|
| + }
|
| +
|
| + void VerifyAndEncryptCredentials(
|
| + const std::string& guid,
|
| + const VerificationProperties& verification_properties,
|
| + const StringCallback& success_callback,
|
| + const FailureCallback& failure_callback) override {
|
| + success_callback.Run("encrypted_credentials");
|
| + }
|
| +
|
| + void VerifyAndEncryptData(
|
| + const VerificationProperties& verification_properties,
|
| + const std::string& data,
|
| + const StringCallback& success_callback,
|
| + const FailureCallback& failure_callback) override {
|
| + success_callback.Run("encrypted_data");
|
| + }
|
| +};
|
| +
|
| class TestListener : public content::NotificationObserver {
|
| public:
|
| TestListener(const std::string& message, const base::Closure& callback)
|
| @@ -196,6 +230,12 @@ class NetworkingPrivateChromeOSApiTest : public ExtensionApiTest {
|
| true /* add_to_visible */);
|
| }
|
|
|
| + static KeyedService* CreateNetworkingPrivateServiceClient(
|
| + content::BrowserContext* profile) {
|
| + scoped_ptr<CryptoVerifyStub> crypto_verify(new CryptoVerifyStub);
|
| + return new NetworkingPrivateChromeOS(profile, crypto_verify.Pass());
|
| + }
|
| +
|
| void SetUpOnMainThread() override {
|
| detector_ = new NetworkPortalDetectorTestImpl();
|
| NetworkPortalDetector::InitializeForTesting(detector_);
|
| @@ -203,6 +243,9 @@ class NetworkingPrivateChromeOSApiTest : public ExtensionApiTest {
|
| ExtensionApiTest::SetUpOnMainThread();
|
| content::RunAllPendingInMessageLoop();
|
|
|
| + NetworkingPrivateDelegateFactory::GetInstance()->SetTestingFactory(
|
| + profile(), &CreateNetworkingPrivateServiceClient);
|
| +
|
| InitializeSanitizedUsername();
|
|
|
| DBusThreadManager* dbus_manager = DBusThreadManager::Get();
|
|
|