Base infrastructure for Networking Private API on Windows and Mac.

chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

Index: chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
index 7886eedeb25b216d954065c7d927635530493e46..f1b0c9ce97341b3eebdbcb3b444a328ca4f4531d 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
+++ b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
@@ -7,6 +7,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/extensions/api/networking_private/networking_private_process_client.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/external_data_fetcher.h"
@@ -14,8 +15,11 @@
 #include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/policy/policy_types.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/api/networking_private.h"
 #include "chrome/test/base/ui_test_utils.h"
 
+#if defined(ENABLE_EXTENSIONS) && defined(OS_CHROMEOS) || defined(OS_WIN)

[tbarzic, 2013/10/18 21:28:03]

you should exclude the file in gypi file instead of ifdefing the whole file

+
 #if defined(OS_CHROMEOS)
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/cryptohome_client.h"
@@ -33,8 +37,9 @@
 using testing::AnyNumber;
 using testing::Return;
 using testing::_;
+using extensions::api::networking_private::VerificationProperties;
 
-namespace chromeos {
+namespace extensions {

[tbarzic, 2013/10/18 21:28:03]

while you're here, put everything in an anonymous namespace (if possible)

[mef, 2013/10/20 15:59:34]

Done.

 
 #if defined(OS_CHROMEOS)
 const char kUser1ProfilePath[] = "/profile/user1/shill";
@@ -220,7 +225,35 @@ class ExtensionNetworkingPrivateApiTest :
   virtual void SetUpOnMainThread() OVERRIDE {
     ExtensionApiTest::SetUpOnMainThread();
     content::RunAllPendingInMessageLoop();
+    base::DictionaryValue mock_parameters;
+    process_client_ =
+        extensions::NetworkingPrivateProcessClient::GetForProfile(profile());
+    // Prevent shutdown between calls.
+    process_client_->AddMessageCallbacks();
+    // Use Mocks WiFiService to test plumbing.
+    process_client_->UseMocks(mock_parameters, new CryptoVerifyMock());

[tbarzic, 2013/10/18 21:28:03]

I'd rename UseMocks to SetupForTest and add logic that keeps the client alive
there instead of calling AddMessageCallback from here (or maybe add a test
observer here).

Also, you should ensure that the process client gets properly shutdown (which is
currently not the case) in TearDowmOnMainThread

[mef, 2013/10/20 15:59:34]

Done.

   }
+
+  // Mock Verify* methods implementation to satisfy expectations of
+  // networking_private_apitest.
+  // TODO(mef): Fix ChromeOS implementation to use NetworkingPrivateCrypto,
+  // and update networking_private_apitest to use and expect valid data.
+  // That will eliminate the need for mock implementation.
+  class CryptoVerifyMock : public NetworkingPrivateProcessClient::CryptoVerify {

[tbarzic, 2013/10/18 21:28:03]

move this to anonymous namespace

[mef, 2013/10/20 15:59:34]

Done.

+    virtual bool VerifyDestination(
+        const VerificationProperties& properties) OVERRIDE {
+      return true;
+    }
+
+    virtual bool VerifyAndEncryptData(const VerificationProperties& properties,
+                                      const std::string& plain_data,
+                                      std::string* encoded_data) OVERRIDE {
+      *encoded_data = "encrypted_data";
+      return true;
+    }
+  };
+
+  scoped_refptr<extensions::NetworkingPrivateProcessClient> process_client_;
 #endif  // OS_CHROMEOS
 
  protected:
@@ -256,10 +289,6 @@ IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
       << message_;
 }
 
-IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, CreateNetwork) {
-  EXPECT_TRUE(RunNetworkingSubtest("createNetwork")) << message_;
-}
-
 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetVisibleNetworks) {
   EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworks")) << message_;
 }
@@ -288,6 +317,10 @@ IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, SetProperties) {
 }
 
 #if defined(OS_CHROMEOS)
+IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, CreateNetwork) {
+  EXPECT_TRUE(RunNetworkingSubtest("createNetwork")) << message_;
+}
+
 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetStateNonExistent) {
   EXPECT_TRUE(RunNetworkingSubtest("getStateNonExistent")) << message_;
 }
@@ -382,4 +415,7 @@ INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation,
                         ExtensionNetworkingPrivateApiTest,
                         testing::Bool());
 
-}  // namespace chromeos
+}  // namespace extensions
+
+#endif  // defined(ENABLE_EXTENSIONS) && defined(OS_CHROMEOS) || defined(OS_WIN)
+