Fix PPB_MouseLock.LockMouse crash and add tests.

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 6229b2a58003153c04e431944d0f9e5837c72821..01cb821580a7c35126f1fa15f898337d9488b6f5 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -259,6 +259,8 @@
         'test/logging/win/mof_data_parser.h',
         'test/logging/win/test_log_collector.cc',
         'test/logging/win/test_log_collector.h',
+        'test/ppapi/ppapi_test.cc',
+        'test/ppapi/ppapi_test.h',
         # TODO:  these should live here but are currently used by
         # production code code in libbrowser (in chrome.gyp).
         #'../content/browser/net/url_request_mock_http_job.cc',
@@ -467,7 +469,8 @@
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/npapi/npapi.gyp:npapi',
-        # run time dependency
+        # Runtime dependencies
+        '../ppapi/ppapi_internal.gyp:ppapi_tests',
         '../webkit/support/webkit_support.gyp:webkit_resources',
       ],
       'include_dirs': [
@@ -511,6 +514,7 @@
         'test/base/chrome_test_launcher.cc',
         'test/base/view_event_test_base.cc',
         'test/base/view_event_test_base.h',
+        'test/ppapi/ppapi_interactive_browsertest.cc',

[dmichael (off chromium), 2012/07/02 17:34:16]

Is it appropriate to put this here? We simulate the pepper input events with the
PPB_Testing_Dev API, and I'm not sure what kinds of tests should be
interactive_ui_tests.

(I don't mean to imply that what you've done is wrong; I simply don't know. I
want to make sure you've checked with somebody who does know, like maybe jam. If
we don't need to have the tests separated, I'd rather keep them in one place.)

[yzshen1, 2012/07/02 19:20:20]

It requires focus to work properly, which means we cannot run it in parallel
with others. browser_tests does sharding while interactive_ui_tests doesn't.
Other mouse lock tests are put in this group, too.
(fullscreen_controller_interactive_browsertest)

         '../content/browser/mouseleave_browsertest.cc',
       ],
       'conditions': [
@@ -2553,24 +2557,6 @@
       'type': 'executable',
       'msvs_cygwin_shell': 0,
       'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
-      'copies': [
-        {
-          'destination': '<(PRODUCT_DIR)',
-          'files': [
-            # Keep 'test_case.html.mock-http-headers' with 'test_case.html'.
-            '../ppapi/tests/test_case.html',
-            '../ppapi/tests/test_case.html.mock-http-headers',
-            '../ppapi/tests/test_page.css',
-            '../ppapi/native_client/tests/ppapi_tests/ppapi_nacl_tests_newlib.nmf',
-          ],
-        },
-        {
-          'destination': '<(PRODUCT_DIR)/test_url_loader_data',
-          'files': [
-            '../ppapi/tests/test_url_loader_data/hello.txt',
-          ],
-        },
-      ],
       'dependencies': [
         'browser',
         '../sync/protocol/sync_proto.gyp:sync_proto',
@@ -3003,8 +2989,8 @@
         'test/data/webui/print_preview.js',
         'test/data/webui/suidsandbox_browsertest.js',
         'test/gpu/gpu_feature_browsertest.cc',
+        'test/ppapi/ppapi_browsertest.cc',
         'test/security_tests/sandbox_browsertest.cc',
-        'test/ui/ppapi_uitest.cc',
         # TODO(craig): Rename this and run from base_unittests when the test
         # is safe to run there. See http://crbug.com/78722 for details.
         '../base/files/file_path_watcher_browsertest.cc',