Android: fixes content_browsertests.

Following crrev.com/209345, a couple of files have been deleted / renamed.

TBR=fsamuel@chromium.org
BUG=
NOTRY=TRUE

Review URL: https://chromiumcodereview.appspot.com/18332003

git-svn-id: http://src.chromium.org/svn/trunk/src/build@209410 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

android/pylib/gtest/test_runner.py

@@ -192,7 +192,7 @@ def _GetDataFilesForTestSuite(product_dir, test_suite_basename):
         'content/test/data/browser_plugin_post_message_guest.html',
         'content/test/data/content-disposition-empty.html.mock-http-headers',
         'content/test/data/session_history',
-        'content/test/data/browser_plugin_naming_guest.html',
+        'content/test/data/browser_plugin_embedder.html',
         'content/test/data/overscroll_navigation.html',
         'content/test/data/simple_database.html',
         'content/test/data/gtk_key_bindings_test_gtkrc',
@@ -200,7 +200,6 @@ def _GetDataFilesForTestSuite(product_dir, test_suite_basename):
         'content/test/data/sync_xmlhttprequest.html',
         'content/test/data/content-sniffer-test3-frame.txt.mock-http-headers',
         'content/test/data/frame_tree',
-        'content/test/data/browser_plugin_naming_embedder.html',
         'content/test/data/content-sniffer-test2.html.mock-http-headers',
         'content/test/data/sync_xmlhttprequest_disallowed.html',
         'content/test/data/rwh_simple.html',