Enable remoting unittests to run on build bots

Renamed chromoting.gyp to remoting.gyp.

Also enabled remoting_unittests to be executed on the build bots.

Review URL: http://codereview.chromium.org/2720007

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

3 files changed, 10 insertions, 1 deletions

diff --git a/tools/heapcheck/chrome_tests.py b/tools/heapcheck/chrome_tests.py
index fbc4174..23c8e06 100755
--- a/tools/heapcheck/chrome_tests.py
+++ b/tools/heapcheck/chrome_tests.py
@@ -87,6 +87,7 @@ class ChromeTests(object):
       "media": self.TestMedia,          "media_unittests": self.TestMedia,
       "net": self.TestNet,              "net_unittests": self.TestNet,
       "printing": self.TestPrinting,    "printing_unittests": self.TestPrinting,
+      "remoting": self.TestRemoting,    "remoting_unittests": self.TestRemoting,
       "startup": self.TestStartup,      "startup_tests": self.TestStartup,
       "test_shell": self.TestTestShell, "test_shell_tests": self.TestTestShell,
       "ui": self.TestUI,                "ui_tests": self.TestUI,
@@ -254,6 +255,9 @@ class ChromeTests(object):
   def TestPrinting(self):
     return self.SimpleTest("chrome", "printing_unittests")
 
+  def TestRemoting(self):
+    return self.SimpleTest("chrome", "remoting_unittests")
+
   def TestIpc(self):
     return self.SimpleTest("ipc", "ipc_tests")
 
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index 756caf3..f30c822 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -235,6 +235,9 @@ class ChromeTests:
   def TestPrinting(self):
     return self.SimpleTest("chrome", "printing_unittests")
 
+  def TestRemoting(self):
+    return self.SimpleTest("chrome", "remoting_unittests")
+
   def TestIpc(self):
     return self.SimpleTest("ipc", "ipc_tests",
                            valgrind_test_args=["--trace_children"])
@@ -388,6 +391,7 @@ class ChromeTests:
     "media": TestMedia,          "media_unittests": TestMedia,
     "net": TestNet,              "net_unittests": TestNet,
     "printing": TestPrinting,    "printing_unittests": TestPrinting,
+    "remoting": TestRemoting,    "remoting_unittests": TestRemoting,
     "startup": TestStartup,      "startup_tests": TestStartup,
     "sync": TestSync,            "sync_unit_tests": TestSync,
     "test_shell": TestTestShell, "test_shell_tests": TestTestShell,
diff --git a/tools/wine_valgrind/chrome_tests.sh b/tools/wine_valgrind/chrome_tests.sh
index bed3222..990e0a5 100755
--- a/tools/wine_valgrind/chrome_tests.sh
+++ b/tools/wine_valgrind/chrome_tests.sh
@@ -62,7 +62,7 @@ _EOF_
 
 # Tests, grouped by how long they take to run
 # Skip ones that require chrome itself for the moment
-SUITES_1="googleurl_unittests printing_unittests sbox_validation_tests setup_unittests"
+SUITES_1="googleurl_unittests printing_unittests remoting_unittests sbox_validation_tests setup_unittests"
 #SUITES_10="app_unittests courgette_unittests ipc_tests reliability_tests sbox_integration_tests sbox_unittests tab_switching_test tcmalloc_unittests url_fetch_test"
 SUITES_10="app_unittests courgette_unittests ipc_tests sbox_unittests tcmalloc_unittests"
 #SUITES_100="automated_ui_tests installer_util_unittests media_unittests nacl_ui_tests net_perftests net_unittests plugin_tests sync_unit_tests"
@@ -209,6 +209,7 @@ get_expected_runtime() {
   media_unittests)       echo 400;;
   net_unittests)         echo 2000;;
   printing_unittests)    echo 100;;
+  remoting_unittests)    echo 200;;
   sbox_unittests)        echo 100;;
   sbox_validation_tests) echo 100;;
   setup_unittests)       echo 100;;