Make the sync integration tests self-contained on autotest

chrome/test/chromeos/autotest/files/client/site_tests/desktopui_SyncIntegrationTests/desktopui_SyncIntegrationTests.py

Index: chrome/test/chromeos/autotest/files/client/site_tests/desktopui_SyncIntegrationTests/desktopui_SyncIntegrationTests.py
diff --git a/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_SyncIntegrationTests/desktopui_SyncIntegrationTests.py b/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_SyncIntegrationTests/desktopui_SyncIntegrationTests.py
index 50b47adf8f8dd8a2280b39f877a9ae6433debe6d..2607ff45fa5e3777d675f69f5800345fbe8aa659 100644
--- a/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_SyncIntegrationTests/desktopui_SyncIntegrationTests.py
+++ b/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_SyncIntegrationTests/desktopui_SyncIntegrationTests.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Chromium 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.
 
@@ -7,9 +7,8 @@ from autotest_lib.client.cros import chrome_test
 class desktopui_SyncIntegrationTests(chrome_test.ChromeTestBase):
     version = 1
 
-    def run_once(self):
-        password_file = '%s/sync_password.txt' % self.bindir
+    binary_to_run = 'sync_integration_tests'
+    cmd_line_params = '--test-terminate-timeout=120000'

[DaleCurtis, 2011/01/25 22:17:45]

I was referring only to the 120000 part in my last comment, but this works as
well. Whatever you feel is more readable.

 
-        self.run_chrome_test('sync_integration_tests',
-            ('--password-file-for-test=%s ' +
-             '--test-terminate-timeout=300000') % password_file)
+    def run_once(self):
+        self.run_chrome_test(self.binary_to_run, self.cmd_line_params)