Make NetworkList and NetworkMonitor APIs public

ppapi/tests/test_network_monitor_private.cc

Index: ppapi/tests/test_network_monitor_private.cc
diff --git a/ppapi/tests/test_network_monitor_private.cc b/ppapi/tests/test_network_monitor_private.cc
deleted file mode 100644
index 382cbe0feac7cf22f628240a82f29fdf1a2e45b4..0000000000000000000000000000000000000000
--- a/ppapi/tests/test_network_monitor_private.cc
+++ /dev/null
@@ -1,182 +0,0 @@
-// Copyright (c) 2012 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 "ppapi/tests/test_network_monitor_private.h"
-
-#include <string.h>
-
-#include "ppapi/cpp/completion_callback.h"
-#include "ppapi/cpp/instance_handle.h"
-#include "ppapi/cpp/module.h"
-#include "ppapi/cpp/net_address.h"
-#include "ppapi/cpp/private/network_list_private.h"
-#include "ppapi/cpp/private/network_monitor_private.h"
-#include "ppapi/tests/testing_instance.h"
-#include "ppapi/tests/test_utils.h"
-
-REGISTER_TEST_CASE(NetworkMonitorPrivate);
-
-namespace {
-
-class MonitorDeletionCallbackDelegate
-    : public TestCompletionCallback::Delegate {
- public:
-  explicit MonitorDeletionCallbackDelegate(pp::NetworkMonitorPrivate* monitor)
-      : monitor_(monitor) {
-  }
-
-  // TestCompletionCallback::Delegate interface.
-  virtual void OnCallback(void* user_data, int32_t result) {
-    delete monitor_;
-  }
-
- private:
-  pp::NetworkMonitorPrivate* monitor_;
-};
-
-}  // namespace
-
-TestNetworkMonitorPrivate::TestNetworkMonitorPrivate(TestingInstance* instance)
-    : TestCase(instance) {
-}
-
-bool TestNetworkMonitorPrivate::Init() {
-  if (!pp::NetworkMonitorPrivate::IsAvailable())
-    return false;
-
-  return CheckTestingInterface();
-}
-
-void TestNetworkMonitorPrivate::RunTests(const std::string& filter) {
-  RUN_TEST_FORCEASYNC_AND_NOT(Basic, filter);
-  RUN_TEST_FORCEASYNC_AND_NOT(2Monitors, filter);
-  RUN_TEST_FORCEASYNC_AND_NOT(DeleteInCallback, filter);
-}
-
-std::string TestNetworkMonitorPrivate::VerifyNetworkList(
-    const pp::NetworkListPrivate& network_list) {
-  // Verify that there is at least one network interface.
-  size_t count = network_list.GetCount();
-  ASSERT_TRUE(count >= 1U);
-
-  // Iterate over all interfaces and verify their properties.
-  for (size_t iface = 0; iface < count; ++iface) {
-    // Verify that the first interface has at least one address.
-    std::vector<pp::NetAddress> addresses;
-    network_list.GetIpAddresses(iface, &addresses);
-    ASSERT_TRUE(addresses.size() >= 1U);
-    // Verify that the addresses are valid.
-    for (size_t i = 0; i < addresses.size(); ++i) {
-      PP_NetAddress_Family family = addresses[i].GetFamily();
-
-      switch (family) {
-        case PP_NETADDRESS_FAMILY_IPV4: {
-          PP_NetAddress_IPv4 ipv4;
-          ASSERT_TRUE(addresses[i].DescribeAsIPv4Address(&ipv4));
-
-          // Verify that the address is not zero.
-          bool all_zeros = true;
-          for (size_t j = 0; j < sizeof(ipv4.addr); ++j) {
-            if (ipv4.addr[j] != 0) {
-              all_zeros = false;
-              break;
-            }
-          }
-          ASSERT_TRUE(!all_zeros);
-
-          // Verify that port is set to 0.
-          ASSERT_TRUE(ipv4.port == 0);
-          break;
-        }
-
-        case PP_NETADDRESS_FAMILY_IPV6: {
-          PP_NetAddress_IPv6 ipv6;
-          ASSERT_TRUE(addresses[i].DescribeAsIPv6Address(&ipv6));
-
-          // Verify that the address is not zero.
-          bool all_zeros = true;
-          for (size_t j = 0; j < sizeof(ipv6.addr); ++j) {
-            if (ipv6.addr[j] != 0) {
-              all_zeros = false;
-              break;
-            }
-          }
-          ASSERT_TRUE(!all_zeros);
-
-          // Verify that port is set to 0.
-          ASSERT_TRUE(ipv6.port == 0);
-          break;
-        }
-
-        default:
-          ASSERT_TRUE(false);
-      }
-    }
-
-    // Verify that each interface has a unique name and a display name.
-    ASSERT_FALSE(network_list.GetName(iface).empty());
-    ASSERT_FALSE(network_list.GetDisplayName(iface).empty());
-
-    PP_NetworkListType_Private type = network_list.GetType(iface);
-    ASSERT_TRUE(type >= PP_NETWORKLIST_UNKNOWN);
-    ASSERT_TRUE(type <= PP_NETWORKLIST_CELLULAR);
-
-    PP_NetworkListState_Private state = network_list.GetState(iface);
-    ASSERT_TRUE(state >= PP_NETWORKLIST_DOWN);
-    ASSERT_TRUE(state <= PP_NETWORKLIST_UP);
-  }
-
-  PASS();
-}
-
-std::string TestNetworkMonitorPrivate::TestBasic() {
-  TestCompletionCallbackWithOutput<pp::NetworkListPrivate> test_callback(
-      instance_->pp_instance());
-  pp::NetworkMonitorPrivate network_monitor(instance_);
-  test_callback.WaitForResult(
-      network_monitor.UpdateNetworkList(test_callback.GetCallback()));
-
-  ASSERT_EQ(test_callback.result(), PP_OK);
-  ASSERT_SUBTEST_SUCCESS(VerifyNetworkList(test_callback.output()));
-
-  PASS();
-}
-
-std::string TestNetworkMonitorPrivate::Test2Monitors() {
-  TestCompletionCallbackWithOutput<pp::NetworkListPrivate> test_callback(
-     instance_->pp_instance());
-  pp::NetworkMonitorPrivate network_monitor(instance_);
-  test_callback.WaitForResult(
-      network_monitor.UpdateNetworkList(test_callback.GetCallback()));
-
-  ASSERT_EQ(test_callback.result(), PP_OK);
-  ASSERT_SUBTEST_SUCCESS(VerifyNetworkList(test_callback.output()));
-
-  TestCompletionCallbackWithOutput<pp::NetworkListPrivate> test_callback_2(
-      instance_->pp_instance());
-  pp::NetworkMonitorPrivate network_monitor_2(instance_);
-  test_callback_2.WaitForResult(
-      network_monitor_2.UpdateNetworkList(test_callback_2.GetCallback()));
-
-  ASSERT_EQ(test_callback_2.result(), PP_OK);
-  ASSERT_SUBTEST_SUCCESS(VerifyNetworkList(test_callback_2.output()));
-
-  PASS();
-}
-
-std::string TestNetworkMonitorPrivate::TestDeleteInCallback() {
-  pp::NetworkMonitorPrivate* network_monitor =
-      new pp::NetworkMonitorPrivate(instance_);
-  MonitorDeletionCallbackDelegate deletion_delegate(network_monitor);
-  TestCompletionCallbackWithOutput<pp::NetworkListPrivate> test_callback(
-      instance_->pp_instance());
-  test_callback.SetDelegate(&deletion_delegate);
-  test_callback.WaitForResult(
-      network_monitor->UpdateNetworkList(test_callback.GetCallback()));
-
-  ASSERT_EQ(test_callback.result(), PP_OK);
-  ASSERT_SUBTEST_SUCCESS(VerifyNetworkList(test_callback.output()));
-
-  PASS();
-}