Base infrastructure for Networking Private API on Windows and Mac.

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #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"
 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
 #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"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_device_client.h"
 #include "chromeos/dbus/shill_manager_client.h"
 #include "chromeos/dbus/shill_profile_client.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "chromeos/dbus/shill_stub_helper.h"
 #include "chromeos/network/onc/onc_utils.h"
 #include "components/onc/onc_constants.h"
 #include "policy/policy_constants.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #endif  // OS_CHROMEOS

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

add a blank line here

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

Done.

 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";
 #endif  // defined(OS_CHROMEOS)
 
 
 class ExtensionNetworkingPrivateApiTest :
     public ExtensionApiTest,
     public testing::WithParamInterface<bool> {
  public:
@@ skipping 165 matching lines @@
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionApiTest::SetUpCommandLine(command_line);
     // Whitelist the extension ID of the test extension.
     command_line->AppendSwitchASCII(::switches::kWhitelistedExtensionID,
                                     "epcifkihnkjgphfkloaaleeakhpmgdmn");
   }
 
   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:
   policy::MockConfigurationPolicyProvider provider_;
   std::string userhash_;
 };
 
 // Place each subtest into a separate browser test so that the stub networking
 // library state is reset for each subtest run. This way they won't affect each
 // other.
@@ skipping 15 matching lines @@
                        StartDisconnectNonexistent) {
   EXPECT_TRUE(RunNetworkingSubtest("startDisconnectNonexistent")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
                        StartGetPropertiesNonexistent) {
   EXPECT_TRUE(RunNetworkingSubtest("startGetPropertiesNonexistent"))
       << 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_;
 }
 
 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
                        GetVisibleNetworksWifi) {
   EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworksWifi")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, RequestNetworkScan) {
   EXPECT_TRUE(RunNetworkingSubtest("requestNetworkScan")) << message_;
 }
 
 // Properties are filtered and translated through
 // ShillToONCTranslator::TranslateWiFiWithState
 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetProperties) {
   EXPECT_TRUE(RunNetworkingSubtest("getProperties")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetState) {
   EXPECT_TRUE(RunNetworkingSubtest("getState")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, SetProperties) {
   EXPECT_TRUE(RunNetworkingSubtest("setProperties")) << message_;
 }
 
 #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_;
 }
 
 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
                        GetManagedProperties) {
   ShillServiceClient::TestInterface* service_test =
       DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface();
   const std::string uidata_blob =
       "{ \"user_settings\": {"
@@ skipping 74 matching lines @@
 
 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
                        VerifyAndEncryptData) {
   EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptData")) << message_;
 }
 
 INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation,
                         ExtensionNetworkingPrivateApiTest,
                         testing::Bool());
 
-}  // namespace chromeos
+}  // namespace extensions
+
+#endif  // defined(ENABLE_EXTENSIONS) && defined(OS_CHROMEOS) || defined(OS_WIN)
+