| Index: chrome/browser/extensions/api/networking_private/networking_private_process_client.h
|
| diff --git a/chrome/browser/extensions/api/networking_private/networking_private_process_client.h b/chrome/browser/extensions/api/networking_private/networking_private_process_client.h
|
| index 52201ac5553694be06def6fbde61e0bd42cbb6d8..759e41e0bcfe96529a16bc741d936603821ee58c 100644
|
| --- a/chrome/browser/extensions/api/networking_private/networking_private_process_client.h
|
| +++ b/chrome/browser/extensions/api/networking_private/networking_private_process_client.h
|
| @@ -118,15 +118,16 @@ class NetworkingPrivateProcessClient
|
| // Gets the list of visible networks and calls |callback|.
|
| void GetVisibleNetworks(const ListResultCallback& callback);
|
|
|
| - void VerifyDestination(
|
| - scoped_ptr<base::ListValue> args,
|
| - const BoolResultCallback& callback,
|
| - const CryptoErrorCallback& error_callback);
|
| + // Verify that Chromecast provides valid cryptographically signed properties.
|
| + void VerifyDestination(scoped_ptr<base::ListValue> args,
|
| + const BoolResultCallback& callback,
|
| + const CryptoErrorCallback& error_callback);
|
|
|
| - void VerifyAndEncryptData(
|
| - scoped_ptr<base::ListValue> args,
|
| - const StringResultCallback& callback,
|
| - const CryptoErrorCallback& error_callback);
|
| + // Verify that Chromecast provides valid cryptographically signed properties.
|
| + // If valid, then encrypt data using Chromecast's public key.
|
| + void VerifyAndEncryptData(scoped_ptr<base::ListValue> args,
|
| + const StringResultCallback& callback,
|
| + const CryptoErrorCallback& error_callback);
|
|
|
| // Adds observer to network events.
|
| void AddObserver(Observer* network_events_observer);
|
| @@ -137,9 +138,12 @@ class NetworkingPrivateProcessClient
|
|
|
| // Switches Utility Process to use WiFiServiceMock for browser_tests and
|
| // mock CryptoVerify implementation.
|
| - void SetupForTest(const base::DictionaryValue& parameters,
|
| + void SetUpForTest(const base::DictionaryValue& parameters,
|
| CryptoVerify* crypto_verify_mock);
|
|
|
| + // Teardown test for browser_tests.
|
| + void TearDownForTest();
|
| +
|
| // Gets a NetworkingPrivateProcessClient instances, creating one if it
|
| // doesn't exist.
|
| static scoped_refptr<NetworkingPrivateProcessClient>
|
| @@ -160,13 +164,9 @@ class NetworkingPrivateProcessClient
|
| ErrorCallback error_callback;
|
|
|
| MessageCallbacksID id;
|
| - scoped_refptr<NetworkingPrivateProcessClient> process_client;
|
| };
|
| typedef IDMap<MessageCallbacks, IDMapOwnPointer> MessageCallbacksMap;
|
|
|
| - // Launches the task to start the external process.
|
| - void Start();
|
| -
|
| // UtilityProcessHostClient implementation:
|
| virtual void OnProcessCrashed(int exit_code) OVERRIDE;
|
| virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
|
| @@ -191,6 +191,8 @@ class NetworkingPrivateProcessClient
|
|
|
| virtual ~NetworkingPrivateProcessClient();
|
|
|
| + // Launches the task to start the external process.
|
| + void Start();
|
| // Creates a new UtilityProcessHost, which launches the utility process.
|
| void StartProcessOnIOThread(content::BrowserThread::ID thread_id);
|
| // Deletes a UtilityProcessHost, which stops the utility process.
|
|
|