Turning off tests for persistent file system. Since the use of the persistent file system requires user interaction with the infobar, I am turning it off for now since it won't run in an automated test.

BUG= http://code.google.com/p/chromium/issues/detail?id=92675
Review URL: http://codereview.chromium.org/7793010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99252 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 55 insertions, 138 deletions

diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/common.cc b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/common.cc
index d04679b..38a7c3a 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/common.cc
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/common.cc
@@ -1,23 +1,23 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2011 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 "native_client/tests/ppapi_browser/ppb_file_io/common.h"
+#include "ppapi/native_client/tests/ppapi_browser/ppb_file_io/common.h"
 
 #include <string.h>
 #include <string>
 
 #include "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/src/third_party/ppapi/c/pp_errors.h"
-#include "native_client/src/third_party/ppapi/c/ppb_core.h"
-#include "native_client/src/third_party/ppapi/c/ppb_file_io.h"
-#include "native_client/src/third_party/ppapi/c/ppb_file_ref.h"
-#include "native_client/src/third_party/ppapi/c/ppb_file_system.h"
-#include "native_client/src/third_party/ppapi/c/ppb_messaging.h"
-#include "native_client/src/third_party/ppapi/c/ppb_url_loader.h"
-#include "native_client/src/third_party/ppapi/c/ppb_var.h"
-#include "native_client/tests/ppapi_test_lib/get_browser_interface.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
+#include "ppapi/c/pp_errors.h"
+#include "ppapi/c/ppb_core.h"
+#include "ppapi/c/ppb_file_io.h"
+#include "ppapi/c/ppb_file_ref.h"
+#include "ppapi/c/ppb_file_system.h"
+#include "ppapi/c/ppb_messaging.h"
+#include "ppapi/c/ppb_url_loader.h"
+#include "ppapi/c/ppb_var.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
 
 namespace common {
 
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/common.h b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/common.h
index 4f414b1..eef0cad 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/common.h
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/common.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2011 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.
 #ifndef NATIVE_CLIENT_TESTS_PPAPI_BROWSER_PPB_FILE_IO_COMMON_H_
@@ -6,9 +6,9 @@
 
 #include <deque>
 
-#include "native_client/src/third_party/ppapi/c/pp_file_info.h"
-#include "native_client/tests/ppapi_browser/ppb_file_io/test_sequence_element.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
+#include "ppapi/c/pp_file_info.h"
+#include "ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_sequence_element.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
 
 namespace common {
 
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/ppapi_ppb_file_io.cc b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/ppapi_ppb_file_io.cc
index d866d98..08137a5 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/ppapi_ppb_file_io.cc
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/ppapi_ppb_file_io.cc
@@ -1,54 +1,36 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2011 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 "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/tests/ppapi_browser/ppb_file_io/common.h"
-#include "native_client/tests/ppapi_test_lib/get_browser_interface.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
+#include "ppapi/native_client/tests/ppapi_browser/ppb_file_io/common.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
 
 // Open tests
-extern void TestOpenExistingFileLocalPersistent();
 extern void TestOpenExistingFileLocalTemporary();
-extern void TestOpenNonExistingFileLocalPersistent();
 extern void TestOpenNonExistingFileLocalTemporary();
 // Query tests
-extern void TestQueryFileLocalPersistent();
 extern void TestQueryFileLocalTemporary();
 // Read tests
-extern void TestCompleteReadLocalPersistent();
 extern void TestCompleteReadLocalTemporary();
-extern void TestParallelReadLocalPersistent();
 extern void TestParallelReadLocalTemporary();
-extern void TestPartialFileReadLocalPersistent();
 extern void TestPartialFileReadLocalTemporary();
 
 void SetupTests() {
   // Open tests
-  RegisterTest("TestOpenExistingFileLocalPersistent",
-               TestOpenExistingFileLocalPersistent);
   RegisterTest("TestOpenExistingFileLocalTemporary",
                TestOpenExistingFileLocalTemporary);
-  RegisterTest("TestOpenNonExistingFileLocalPersistent",
-               TestOpenNonExistingFileLocalPersistent);
   RegisterTest("TestOpenNonExistingFileLocalTemporary",
                TestOpenNonExistingFileLocalTemporary);
   // Query tests
-  RegisterTest("TestQueryFileLocalPersistent",
-               TestQueryFileLocalPersistent);
   RegisterTest("TestQueryFileLocalTemporary",
                TestQueryFileLocalTemporary);
-  // Rest tests
-  RegisterTest("TestCompleteReadLocalPersistent",
-               TestCompleteReadLocalPersistent);
+  // Read tests
   RegisterTest("TestCompleteReadLocalTemporary",
                TestCompleteReadLocalTemporary);
-  RegisterTest("TestParallelReadLocalPersistent",
-               TestParallelReadLocalPersistent);
   RegisterTest("TestParallelReadLocalTemporary",
                TestParallelReadLocalTemporary);
-  RegisterTest("TestPartialFileReadLocalPersistent",
-               TestPartialFileReadLocalPersistent);
   RegisterTest("TestPartialFileReadLocalTemporary",
                TestPartialFileReadLocalTemporary);
 }
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/ppapi_ppb_file_io.js b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/ppapi_ppb_file_io.js
index 623e86d..bea7a15 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/ppapi_ppb_file_io.js
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/ppapi_ppb_file_io.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -18,13 +18,6 @@ function setupTests(tester, plugin) {
       'WriteFileForSetupCallback',
       'FlushFileForSetupCallback',
       'TouchFileForSetupCallback'];
-  addTest('TestOpenExistingFileLocalPersistent',
-          setupCallbacks.concat(['TestOpenForRead',
-                                 'TestOpenForWrite',
-                                 'TestOpenTruncate',
-                                 'TestOpenForWriteCreateExclusive',
-                                 'TestOpenForWriteCreate',
-                                 'END']));
   addTest('TestOpenExistingFileLocalTemporary',
           setupCallbacks.concat(['TestOpenForRead',
                                  'TestOpenForWrite',
@@ -32,13 +25,6 @@ function setupTests(tester, plugin) {
                                  'TestOpenForWriteCreateExclusive',
                                  'TestOpenForWriteCreate',
                                  'END']));
-  addTest('TestOpenNonExistingFileLocalPersistent',
-          setupCallbacks.concat(['TestOpenForRead',
-                                 'TestOpenForWrite',
-                                 'TestOpenForWriteCreate',
-                                 'DeleteFile',
-                                 'TestOpenForWriteCreateExclusive',
-                                 'END']));
   addTest('TestOpenNonExistingFileLocalTemporary',
           setupCallbacks.concat(['TestOpenForRead',
                                  'TestOpenForWrite',
@@ -46,42 +32,21 @@ function setupTests(tester, plugin) {
                                  'DeleteFile',
                                  'TestOpenForWriteCreateExclusive',
                                  'END']));
-  addTest('TestQueryFileLocalPersistent',
-          setupCallbacks.concat(['OpenFileForTest',
-                                 'TestQuery',
-                                 'TestQueryFileVerify',
-                                 'END']));
   addTest('TestQueryFileLocalTemporary',
           setupCallbacks.concat(['OpenFileForTest',
                                  'TestQuery',
                                  'TestQueryFileVerify',
                                  'END']));
-  addTest('TestPartialFileReadLocalPersistent',
-          setupCallbacks.concat(['OpenFileForTest',
-                                 'TestFileRead',
-                                 'ReadCallback:VERIFIED',
-                                 'END']));
   addTest('TestPartialFileReadLocalTemporary',
           setupCallbacks.concat(['OpenFileForTest',
                                  'TestFileRead',
                                  'ReadCallback:VERIFIED',
                                  'END']));
-  addTest('TestCompleteReadLocalPersistent',
-          setupCallbacks.concat(['OpenFileForTest',
-                                 'TestFileRead',
-                                 'ReadCallback:VERIFIED',
-                                 'END']));
   addTest('TestCompleteReadLocalTemporary',
           setupCallbacks.concat(['OpenFileForTest',
                                  'TestFileRead',
                                  'ReadCallback:VERIFIED',
                                  'END']));
-  addTest('TestParallelReadLocalPersistent',
-          setupCallbacks.concat(['OpenFileForTest',
-                                 'TestParallelRead',
-                                 'ReadCallback:VERIFIED',
-                                 'ReadCallback:VERIFIED',
-                                 'END']));
   addTest('TestParallelReadLocalTemporary',
           setupCallbacks.concat(['OpenFileForTest',
                                  'TestParallelRead',
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_open.cc b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_open.cc
index 2e2b1ac..5d736a5 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_open.cc
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_open.cc
@@ -1,16 +1,16 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2011 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 "native_client/src/third_party/ppapi/c/pp_errors.h"
-#include "native_client/src/third_party/ppapi/c/ppb_core.h"
-#include "native_client/src/third_party/ppapi/c/ppb_file_io.h"
-#include "native_client/src/third_party/ppapi/c/ppb_file_ref.h"
-#include "native_client/src/third_party/ppapi/c/ppb_file_system.h"
-#include "native_client/src/third_party/ppapi/c/ppb_url_loader.h"
-#include "native_client/tests/ppapi_browser/ppb_file_io/common.h"
-#include "native_client/tests/ppapi_test_lib/get_browser_interface.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
+#include "ppapi/c/pp_errors.h"
+#include "ppapi/c/ppb_core.h"
+#include "ppapi/c/ppb_file_io.h"
+#include "ppapi/c/ppb_file_ref.h"
+#include "ppapi/c/ppb_file_system.h"
+#include "ppapi/c/ppb_url_loader.h"
+#include "ppapi/native_client/tests/ppapi_browser/ppb_file_io/common.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
 
 namespace {
 
@@ -151,21 +151,11 @@ void TestOpenExistingFile(PP_FileSystemType system_type) {
 
 }  // namespace
 
-void TestOpenExistingFileLocalPersistent() {
-  TestOpenExistingFile(PP_FILESYSTEMTYPE_LOCALPERSISTENT);
-  TEST_PASSED;
-}
-
 void TestOpenExistingFileLocalTemporary() {
   TestOpenExistingFile(PP_FILESYSTEMTYPE_LOCALTEMPORARY);
   TEST_PASSED;
 }
 
-void TestOpenNonExistingFileLocalPersistent() {
-  TestOpenNonExistingFile(PP_FILESYSTEMTYPE_LOCALPERSISTENT);
-  TEST_PASSED;
-}
-
 void TestOpenNonExistingFileLocalTemporary() {
   TestOpenNonExistingFile(PP_FILESYSTEMTYPE_LOCALTEMPORARY);
   TEST_PASSED;
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_query.cc b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_query.cc
index 57bc3a4..b3d7d08 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_query.cc
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_query.cc
@@ -1,17 +1,17 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2011 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 <string.h>
 
-#include "native_client/src/third_party/ppapi/c/pp_errors.h"
-#include "native_client/src/third_party/ppapi/c/ppb_core.h"
-#include "native_client/src/third_party/ppapi/c/ppb_file_io.h"
-#include "native_client/src/third_party/ppapi/c/ppb_file_ref.h"
-#include "native_client/src/third_party/ppapi/c/ppb_file_system.h"
-#include "native_client/tests/ppapi_test_lib/get_browser_interface.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
-#include "native_client/tests/ppapi_browser/ppb_file_io/common.h"
+#include "ppapi/c/pp_errors.h"
+#include "ppapi/c/ppb_core.h"
+#include "ppapi/c/ppb_file_io.h"
+#include "ppapi/c/ppb_file_ref.h"
+#include "ppapi/c/ppb_file_system.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
+#include "ppapi/native_client/tests/ppapi_browser/ppb_file_io/common.h"
 
 namespace {
 
@@ -70,11 +70,6 @@ void TestQueryFile(PP_FileSystemType system_type) {
 
 }  // namespace
 
-void TestQueryFileLocalPersistent() {
-  TestQueryFile(PP_FILESYSTEMTYPE_LOCALPERSISTENT);
-  TEST_PASSED;
-}
-
 void TestQueryFileLocalTemporary() {
   TestQueryFile(PP_FILESYSTEMTYPE_LOCALTEMPORARY);
   TEST_PASSED;
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_read.cc b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_read.cc
index c036b35..713a461 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_read.cc
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_read.cc
@@ -1,15 +1,15 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2011 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 <string.h>
 
 #include "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/src/third_party/ppapi/c/pp_errors.h"
-#include "native_client/src/third_party/ppapi/c/ppb_file_io.h"
-#include "native_client/tests/ppapi_test_lib/get_browser_interface.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
-#include "native_client/tests/ppapi_browser/ppb_file_io/common.h"
+#include "ppapi/c/pp_errors.h"
+#include "ppapi/c/ppb_file_io.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
+#include "ppapi/native_client/tests/ppapi_browser/ppb_file_io/common.h"
 
 namespace {
 
@@ -157,32 +157,17 @@ void TestParallelReadFile(PP_FileSystemType system_type) {
 
 }  // namespace
 
-void TestPartialFileReadLocalPersistent() {
-  TestPartialFileRead(PP_FILESYSTEMTYPE_LOCALPERSISTENT);
-  TEST_PASSED;
-}
-
 void TestPartialFileReadLocalTemporary() {
   TestPartialFileRead(PP_FILESYSTEMTYPE_LOCALTEMPORARY);
   TEST_PASSED;
 }
 
-void TestCompleteReadLocalPersistent() {
-  TestCompleteReadFile(PP_FILESYSTEMTYPE_LOCALPERSISTENT);
-  TEST_PASSED;
-}
-
 void TestCompleteReadLocalTemporary() {
   TestCompleteReadFile(PP_FILESYSTEMTYPE_LOCALTEMPORARY);
   TEST_PASSED;
 }
 
 // Test multiple reads of a file using multiple callbacks and different offsets.
-void TestParallelReadLocalPersistent() {
-  TestParallelReadFile(PP_FILESYSTEMTYPE_LOCALPERSISTENT);
-  TEST_PASSED;
-}
-
 void TestParallelReadLocalTemporary() {
   TestParallelReadFile(PP_FILESYSTEMTYPE_LOCALTEMPORARY);
   TEST_PASSED;
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_sequence_element.cc b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_sequence_element.cc
index 2e47020..a325b9e 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_sequence_element.cc
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_sequence_element.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2011 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 "native_client/tests/ppapi_browser/ppb_file_io/test_sequence_element.h"
+#include "ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_sequence_element.h"
 
 #include "native_client/src/include/nacl_scoped_ptr.h"
-#include "native_client/src/third_party/ppapi/c/ppb_core.h"
-#include "native_client/tests/ppapi_test_lib/get_browser_interface.h"
+#include "ppapi/c/ppb_core.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h"
 
 namespace common {
 
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_sequence_element.h b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_sequence_element.h
index 10b60fa..04d9e74 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_sequence_element.h
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/test_sequence_element.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2011 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.
 #ifndef NATIVE_CLIENT_TESTS_PPAPI_BROWSER_PPB_FILE_IO_TEST_SEQUENCE_ELEMENT_H_
@@ -9,9 +9,9 @@
 #include <tr1/functional>
 
 #include "native_client/src/include/nacl_base.h"
-#include "native_client/src/third_party/ppapi/c/pp_errors.h"
-#include "native_client/src/third_party/ppapi/c/pp_file_info.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
+#include "ppapi/c/pp_errors.h"
+#include "ppapi/c/pp_file_info.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
 
 namespace common {