Merge 208513 "PPAPI: Move PPB_NetworkProxy out of Dev"

ppapi/tests/test_network_proxy.cc

 // Copyright (c) 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 "ppapi/tests/test_network_proxy.h"
 
-#include "ppapi/cpp/dev/network_proxy_dev.h"
 #include "ppapi/cpp/instance.h"
+#include "ppapi/cpp/network_proxy.h"
 #include "ppapi/cpp/var.h"
 #include "ppapi/tests/testing_instance.h"
 
 REGISTER_TEST_CASE(NetworkProxy);
 
 TestNetworkProxy::TestNetworkProxy(TestingInstance* instance)
     : TestCase(instance) {
 }
 
 void TestNetworkProxy::RunTests(const std::string& filter) {
@@ skipping 48 matching lines @@
       pp::NetworkProxy::GetProxyForURL(instance_,
                                        pp::Var(42), // non-string Var
                                        callback.GetCallback()));
   CHECK_CALLBACK_BEHAVIOR(callback);
   ASSERT_EQ(PP_ERROR_BADARGUMENT, callback.result());
   // TODO(dmichael): Add this check below when crbug.com/250046 is fixed.
   // ASSERT_TRUE(callback.output().is_undefined());
 
   PASS();
 }