Move URLLoader, URLRequestInfo, and URLResponseInfo out of the dev directory...

ppapi/tests/test_file_ref.cc

 // Copyright (c) 2010 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_file_ref.h"
 
 #include <stdio.h>
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/dev/ppb_file_io_dev.h"
 #include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/cpp/dev/file_io_dev.h"
 #include "ppapi/cpp/dev/file_ref_dev.h"
 #include "ppapi/cpp/dev/file_system_dev.h"
-#include "ppapi/cpp/dev/url_loader_dev.h"
-#include "ppapi/cpp/dev/url_request_info_dev.h"
-#include "ppapi/cpp/dev/url_response_info_dev.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
+#include "ppapi/cpp/url_loader.h"
+#include "ppapi/cpp/url_request_info.h"
+#include "ppapi/cpp/url_response_info.h"
 #include "ppapi/tests/test_utils.h"
 #include "ppapi/tests/testing_instance.h"
 
 REGISTER_TEST_CASE(FileRef);
 
 namespace {
 
 const char* kPersFileName = "persistent";
 const char* kTempFileName = "temporary";
 const char* kParentPath = "/foo/bar";
@@ skipping 31 matching lines @@
       instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
 
   pp::FileRef_Dev file_ref_pers(file_system_pers, kPersFilePath);
   if (file_ref_pers.GetFileSystemType() != PP_FILESYSTEMTYPE_LOCALPERSISTENT)
     return "file_ref_pers expected to be persistent.";
 
   pp::FileRef_Dev file_ref_temp(file_system_temp, kTempFilePath);
   if (file_ref_temp.GetFileSystemType() != PP_FILESYSTEMTYPE_LOCALTEMPORARY)
     return "file_ref_temp expected to be temporary.";
 
-  pp::URLRequestInfo_Dev request;
+  pp::URLRequestInfo request;
   request.SetURL("test_url_loader_data/hello.txt");
   request.SetStreamToFile(true);
 
   TestCompletionCallback callback;
 
-  pp::URLLoader_Dev loader(*instance_);
+  pp::URLLoader loader(*instance_);
   int32_t rv = loader.Open(request, callback);
   if (rv == PP_ERROR_WOULDBLOCK)
     rv = callback.WaitForResult();
   if (rv != PP_OK)
     return "URLLoader::Open() failed.";
 
-  pp::URLResponseInfo_Dev response_info(loader.GetResponseInfo());
+  pp::URLResponseInfo response_info(loader.GetResponseInfo());
   if (response_info.is_null())
     return "URLLoader::GetResponseInfo returned null";
   int32_t status_code = response_info.GetStatusCode();
   if (status_code != 200)
     return "Unexpected HTTP status code";
 
-  pp::FileRef_Dev file_ref_ext(response_info.GetBody());
+  pp::FileRef_Dev file_ref_ext(response_info.GetBodyAsFileRef());
   if (file_ref_ext.GetFileSystemType() != PP_FILESYSTEMTYPE_EXTERNAL)
     return "file_ref_ext expected to be external.";
 
   return "";
 }
 
 std::string TestFileRef::TestGetName() {
   pp::FileSystem_Dev file_system_pers(
       instance_, PP_FILESYSTEMTYPE_LOCALPERSISTENT);
   pp::FileSystem_Dev file_system_temp(
       instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
 
   pp::FileRef_Dev file_ref_pers(file_system_pers, kPersFilePath);
   std::string name = file_ref_pers.GetName().AsString();
   if (name != kPersFileName)
     return ReportMismatch("FileRef::GetName", name, kPersFileName);
 
   pp::FileRef_Dev file_ref_temp(file_system_temp, kTempFilePath);
   name = file_ref_temp.GetName().AsString();
   if (name != kTempFileName)
     return ReportMismatch("FileRef::GetName", name, kTempFileName);
 
   // Test the "/" case.
   pp::FileRef_Dev file_ref_slash(file_system_temp, "/");
   name = file_ref_slash.GetName().AsString();
   if (name != "/")
     return ReportMismatch("FileRef::GetName", name, "/");
 
-  pp::URLRequestInfo_Dev request;
+  pp::URLRequestInfo request;
   request.SetURL("test_url_loader_data/hello.txt");
   request.SetStreamToFile(true);
 
   TestCompletionCallback callback;
 
-  pp::URLLoader_Dev loader(*instance_);
+  pp::URLLoader loader(*instance_);
   int32_t rv = loader.Open(request, callback);
   if (rv == PP_ERROR_WOULDBLOCK)
     rv = callback.WaitForResult();
   if (rv != PP_OK)
     return "URLLoader::Open() failed.";
 
-  pp::URLResponseInfo_Dev response_info(loader.GetResponseInfo());
+  pp::URLResponseInfo response_info(loader.GetResponseInfo());
   if (response_info.is_null())
     return "URLLoader::GetResponseInfo returned null";
   int32_t status_code = response_info.GetStatusCode();
   if (status_code != 200)
     return "Unexpected HTTP status code";
 
-  pp::FileRef_Dev file_ref_ext(response_info.GetBody());
+  pp::FileRef_Dev file_ref_ext(response_info.GetBodyAsFileRef());
   name = file_ref_ext.GetName().AsString();
   if (name != "")
     return ReportMismatch("FileRef::GetName", name, "<empty string>");
 
   return "";
 }
 
 std::string TestFileRef::TestGetPath() {
   pp::FileSystem_Dev file_system_pers(
       instance_, PP_FILESYSTEMTYPE_LOCALPERSISTENT);
   pp::FileSystem_Dev file_system_temp(
       instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
 
   pp::FileRef_Dev file_ref_pers(file_system_pers, kPersFilePath);
   std::string path = file_ref_pers.GetPath().AsString();
   if (path != kPersFilePath)
     return ReportMismatch("FileRef::GetPath", path, kPersFilePath);
 
   pp::FileRef_Dev file_ref_temp(file_system_temp, kTempFilePath);
   path = file_ref_temp.GetPath().AsString();
   if (path != kTempFilePath)
     return ReportMismatch("FileRef::GetPath", path, kTempFilePath);
 
-  pp::URLRequestInfo_Dev request;
+  pp::URLRequestInfo request;
   request.SetURL("test_url_loader_data/hello.txt");
   request.SetStreamToFile(true);
 
   TestCompletionCallback callback;
 
-  pp::URLLoader_Dev loader(*instance_);
+  pp::URLLoader loader(*instance_);
   int32_t rv = loader.Open(request, callback);
   if (rv == PP_ERROR_WOULDBLOCK)
     rv = callback.WaitForResult();
   if (rv != PP_OK)
     return "URLLoader::Open() failed.";
 
-  pp::URLResponseInfo_Dev response_info(loader.GetResponseInfo());
+  pp::URLResponseInfo response_info(loader.GetResponseInfo());
   if (response_info.is_null())
     return "URLLoader::GetResponseInfo returned null";
   int32_t status_code = response_info.GetStatusCode();
   if (status_code != 200)
     return "Unexpected HTTP status code";
 
-  pp::FileRef_Dev file_ref_ext(response_info.GetBody());
+  pp::FileRef_Dev file_ref_ext(response_info.GetBodyAsFileRef());
   if (!file_ref_ext.GetPath().is_undefined())
     return "The path of an external FileRef should be void.";
 
   return "";
 }
 
 std::string TestFileRef::TestGetParent() {
   pp::FileSystem_Dev file_system_pers(
       instance_, PP_FILESYSTEMTYPE_LOCALPERSISTENT);
   pp::FileSystem_Dev file_system_temp(
@@ skipping 14 matching lines @@
   parent_path = file_ref_slash.GetParent().GetPath().AsString();
   if (parent_path != "/")
     return ReportMismatch("FileRef::GetParent", parent_path, "/");
 
   // Test the "/foo" case (the parent is "/").
   pp::FileRef_Dev file_ref_with_root_parent(file_system_temp, "/foo");
   parent_path = file_ref_with_root_parent.GetParent().GetPath().AsString();
   if (parent_path != "/")
     return ReportMismatch("FileRef::GetParent", parent_path, "/");
 
-  pp::URLRequestInfo_Dev request;
+  pp::URLRequestInfo request;
   request.SetURL("test_url_loader_data/hello.txt");
   request.SetStreamToFile(true);
 
   TestCompletionCallback callback;
 
-  pp::URLLoader_Dev loader(*instance_);
+  pp::URLLoader loader(*instance_);
   int32_t rv = loader.Open(request, callback);
   if (rv == PP_ERROR_WOULDBLOCK)
     rv = callback.WaitForResult();
   if (rv != PP_OK)
     return "URLLoader::Open() failed.";
 
-  pp::URLResponseInfo_Dev response_info(loader.GetResponseInfo());
+  pp::URLResponseInfo response_info(loader.GetResponseInfo());
   if (response_info.is_null())
     return "URLLoader::GetResponseInfo returned null";
   int32_t status_code = response_info.GetStatusCode();
   if (status_code != 200)
     return "Unexpected HTTP status code";
 
-  pp::FileRef_Dev file_ref_ext(response_info.GetBody());
+  pp::FileRef_Dev file_ref_ext(response_info.GetBodyAsFileRef());
   if (!file_ref_ext.GetParent().is_null())
     return "The parent of an external FileRef should be null.";
 
   return "";
 }
 
 std::string TestFileRef::TestMakeDirectory() {
   TestCompletionCallback callback;
 
   pp::FileSystem_Dev file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
@@ skipping 187 matching lines @@
 
   pp::FileRef_Dev target_nested_dir_ref(file_system, "/dir_rename_1");
   rv = nested_dir_ref.Rename(target_nested_dir_ref, callback);
   if (rv == PP_ERROR_WOULDBLOCK)
     rv = callback.WaitForResult();
   if (rv != PP_ERROR_FAILED)
     return ReportError("FileSystem::Rename", rv);
 
   return "";
 }