[chromeos] Fix chromeos volume tests

Do not auto-login for chromeos volume tests.

BUG=chromium-os:33557
TEST=chromeos_volume.py

R=craigdh@chromium.org

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

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

chrome/test/functional/chromeos_volume.py

@@ -6,10 +6,15 @@
 import logging
 import os
 import subprocess
+import sys
 
 import pyauto_functional  # Must be imported before pyauto
 import pyauto
 
+sys.path.append('/usr/local')  # To make autotest libs importable.
+from autotest.cros import cros_ui
+from autotest.cros import cryptohome
+
 
 class ChromeosVolume(pyauto.PyUITest):
   """Test case for volume levels.
@@ -20,10 +25,10 @@ class ChromeosVolume(pyauto.PyUITest):
 
   def setUp(self):
     # We want a clean session_manager instance for every run,
-    # so restart session_manager now.
-    assert self.WaitForSessionManagerRestart(
-        lambda: subprocess.call(['pkill', 'session_manager'])), \
-        'Timed out waiting for session_manager to start.'
+    # so restart ui now.
+    cros_ui.stop(allow_fail=True)
+    cryptohome.remove_all_vaults()
+    cros_ui.start(wait_for_login_prompt=False)
     pyauto.PyUITest.setUp(self)
     self._initial_volume_info = self.GetVolumeInfo()
 
@@ -32,6 +37,9 @@ class ChromeosVolume(pyauto.PyUITest):
     self.SetMute(self._initial_volume_info['is_mute'])
     pyauto.PyUITest.tearDown(self)
 
+  def ShouldAutoLogin(self):
+    return False
+
   def _Login(self):
     """Perform login"""
     credentials = self.GetPrivateInfo()['test_google_account']