Remove plugin connection to PPAPI scriptable objects (var deprecated). Also

tests/ppapi_browser/ppb_file_system/ppapi_ppb_file_system.cc

Index: tests/ppapi_browser/ppb_file_system/ppapi_ppb_file_system.cc
===================================================================
--- tests/ppapi_browser/ppb_file_system/ppapi_ppb_file_system.cc	(revision 6005)
+++ tests/ppapi_browser/ppb_file_system/ppapi_ppb_file_system.cc	(working copy)
@@ -34,18 +34,18 @@
    */
   file_system = ppb_file_system->Create(kInvalidInstance,
                                         PP_FILESYSTEMTYPE_EXTERNAL);
-  EXPECT_ASYNC(file_system == kInvalidResource);
+  EXPECT(file_system == kInvalidResource);
   file_system = ppb_file_system->Create(kInvalidInstance,
                                         PP_FILESYSTEMTYPE_LOCALPERSISTENT);
-  EXPECT_ASYNC(file_system == kInvalidResource);
+  EXPECT(file_system == kInvalidResource);
   file_system = ppb_file_system->Create(kInvalidInstance,
                                         PP_FILESYSTEMTYPE_LOCALTEMPORARY);
-  EXPECT_ASYNC(file_system == kInvalidResource);
+  EXPECT(file_system == kInvalidResource);
 
   /* Test for failure when an invalid file system type is requested. */
   file_system = ppb_file_system->Create(pp_instance(),
                                         PP_FILESYSTEMTYPE_INVALID);
-  EXPECT_ASYNC(file_system == kInvalidResource);
+  EXPECT(file_system == kInvalidResource);
 
   /*
    * Test to see if PPB_FileSystem_Dev::Create returns a valid PP_Resource
@@ -55,10 +55,10 @@
   for (size_t j = 0; j < kNumFileSystemTypes; ++j) {
     file_system =
         ppb_file_system->Create(pp_instance(), kFileSystemTypes[j]);
-    EXPECT_ASYNC(file_system != kInvalidResource);
+    EXPECT(file_system != kInvalidResource);
     ppb_core->ReleaseResource(file_system);
   }
-  TEST_PASSED_ASYNC;
+  TEST_PASSED;
 }
 
 void TestIsFileSystem() {
@@ -72,7 +72,7 @@
   PP_Bool is_file_system = PP_FALSE;
 
   /* Test fail for invalid resource. */
-  EXPECT_ASYNC(ppb_file_system->IsFileSystem(kInvalidResource) != PP_TRUE);
+  EXPECT(ppb_file_system->IsFileSystem(kInvalidResource) != PP_TRUE);
 
   /*
    * Test pass for the different valid system types, and test fail against a
@@ -86,10 +86,10 @@
     is_file_system = ppb_file_system->IsFileSystem(file_system);
     ppb_core->ReleaseResource(file_system);
 
-    EXPECT_ASYNC(is_file_system == PP_TRUE);
+    EXPECT(is_file_system == PP_TRUE);
 
     is_file_system = ppb_file_system->IsFileSystem(file_system);
-    EXPECT_ASYNC(is_file_system == PP_FALSE);
+    EXPECT(is_file_system == PP_FALSE);
   }
 
   /* Test fail against a non-filesystem resource */
@@ -97,9 +97,9 @@
   CHECK(url_request_info != kInvalidResource);
   is_file_system = ppb_file_system->IsFileSystem(url_request_info);
   ppb_core->ReleaseResource(url_request_info);
-  EXPECT_ASYNC(is_file_system == PP_FALSE);
+  EXPECT(is_file_system == PP_FALSE);
 
-  TEST_PASSED_ASYNC;
+  TEST_PASSED;
 }
 
 void TestOpen() {
@@ -117,7 +117,7 @@
   int32_t pp_error = ppb_file_system->Open(kInvalidResource,
                                            1024,  /* Dummy value */
                                            open_callback);
-  EXPECT_ASYNC(pp_error == PP_ERROR_BADRESOURCE);
+  EXPECT(pp_error == PP_ERROR_BADRESOURCE);
 
   /*
    * Test to make sure external file system is not supported.
@@ -130,8 +130,8 @@
                                    1024,  /* Dummy value */
                                    open_callback);
   ppb_core->ReleaseResource(file_system);
-  EXPECT_ASYNC(pp_error != PP_OK);
-  EXPECT_ASYNC(pp_error != PP_OK_COMPLETIONPENDING);
+  EXPECT(pp_error != PP_OK);
+  EXPECT(pp_error != PP_OK_COMPLETIONPENDING);
 
   /* Test local temporary and local persistant file systems */
   for (j = 1; j < kNumFileSystemTypes; ++j) {
@@ -148,7 +148,7 @@
                                      1024,  /* Dummy value */
                                      PP_BlockUntilComplete());
     ppb_core->ReleaseResource(file_system);
-    EXPECT_ASYNC(pp_error == PP_ERROR_BADARGUMENT);
+    EXPECT(pp_error == PP_ERROR_BADARGUMENT);
 #endif
 
     /* Test success for asynchronous open */
@@ -158,7 +158,7 @@
                                      1024,  /* Dummy value */
                                      open_callback);
     ppb_core->ReleaseResource(file_system);
-    EXPECT_ASYNC(pp_error == PP_OK_COMPLETIONPENDING);
+    EXPECT(pp_error == PP_OK_COMPLETIONPENDING);
 
     /* Test fail for multiple opens */
     file_system = ppb_file_system->Create(pp_instance(),
@@ -171,9 +171,9 @@
                                      1024,  /* Dummy value */
                                      open_callback);
     ppb_core->ReleaseResource(file_system);
-    EXPECT_ASYNC(pp_error ==  PP_ERROR_FAILED);
+    EXPECT(pp_error ==  PP_ERROR_FAILED);
   }
-  TEST_PASSED_ASYNC;
+  TEST_PASSED;
 }
 
 void TestGetType() {
@@ -187,7 +187,7 @@
   PP_FileSystemType_Dev type = PP_FILESYSTEMTYPE_INVALID;
 
   /* Test for invalid resource. */
-  EXPECT_ASYNC(PP_FILESYSTEMTYPE_INVALID == ppb_file_system->GetType(0));
+  EXPECT(PP_FILESYSTEMTYPE_INVALID == ppb_file_system->GetType(0));
 
   /* Test pass for the different valid system types */
   for (j = 0; j < kNumFileSystemTypes; ++j) {
@@ -198,7 +198,7 @@
     type = ppb_file_system->GetType(file_system);
     ppb_core->ReleaseResource(file_system);
 
-    EXPECT_ASYNC(type == kFileSystemTypes[j]);
+    EXPECT(type == kFileSystemTypes[j]);
   }
 
   /* Test fail against a non-filesystem resource */
@@ -207,9 +207,9 @@
 
   type = ppb_file_system->GetType(url_request_info);
   ppb_core->ReleaseResource(url_request_info);
-  EXPECT_ASYNC(type == PP_FILESYSTEMTYPE_INVALID);
+  EXPECT(type == PP_FILESYSTEMTYPE_INVALID);
 
-  TEST_PASSED_ASYNC;
+  TEST_PASSED;
 }
 
 }  // namespace