Revert 266051 "Remove files in /var/lib/whitelist before attempt..."

trunk/src/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py

Index: trunk/src/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py
===================================================================
--- trunk/src/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py	(revision 266208)
+++ trunk/src/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py	(working copy)
@@ -47,6 +47,8 @@
     self._remote_debugging_port = self._cri.GetRemotePort()
     self._port = self._remote_debugging_port
 
+    self._SetBranchNumber(self._GetChromeVersion())
+
     # Copy extensions to temp directories on the device.
     # Note that we also perform this copy locally to ensure that
     # the owner of the extensions is set to chronos.
@@ -57,11 +59,10 @@
       cri.Chown(extension_dir)
       e.local_path = os.path.join(extension_dir, os.path.basename(e.path))
 
-    self._cri.RunCmdOnDevice(['stop', 'ui'])
+    # Ensure the UI is running and logged out.
+    self._RestartUI()
+    util.WaitFor(self.IsBrowserRunning, 20)
 
-    self._cri.RmRF('/var/lib/whitelist/*')
-    self._cri.RmRF('/home/chronos/Local\ State')
-
     # Delete test user's cryptohome vault (user data directory).
     if not self.browser_options.dont_override_profile:
       self._cri.RunCmdOnDevice(['cryptohome', '--action=remove', '--force',
@@ -72,11 +73,6 @@
                    self.profile_directory)
       cri.Chown(self.profile_directory)
 
-    self._cri.RunCmdOnDevice(['start', 'ui'])
-    util.WaitFor(self.IsBrowserRunning, 20)
-
-    self._SetBranchNumber(self._GetChromeVersion())
-
   def GetBrowserStartupArgs(self):
     args = super(CrOSBrowserBackend, self).GetBrowserStartupArgs()
     args.extend([