Revert 134389 - Fix an incorrectly written policy test. It was using a hook incorrectly and checkin…

chrome/test/functional/policy.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 import logging
 import os
 
 import pyauto_functional  # must come before pyauto.
 import policy_base
@@ skipping 512 matching lines @@
     self.assertTrue('search.my.company' in self.GetActiveTabURL().spec())
     policy = {
       'DefaultSearchProviderEnabled': False,
     }
     self.SetUserPolicy(policy)
     self.assertFalse(
         self._GetPrefIsManagedError(pyauto.kDefaultSearchProviderEnabled,
                                     False))
     self.SetOmniboxText('deli')
     self.WaitUntilOmniboxQueryDone()
-    self.OmniboxAcceptInput()
-    self.assertFalse('search.my.company' in self.GetActiveTabURL().spec())
+    self.assertRaises(pyauto.JSONInterfaceError,
+                      lambda: self.OmniboxAcceptInput())
 
   # Needed for extension tests
   _GOOD_CRX_ID = 'ldnnhddmnhbkjipkidpdiheffobcpfmf'
   _ADBLOCK_CRX_ID = 'dojnnbeimaimaojcialkkgajdnefpgcn'
   _SCREEN_CAPTURE_CRX_ID = 'cpngackimfmofbokmjmljamhdncknpmg'
 
   def _BuildCRXPath(self, crx_file_name):
     """Returns the complete path to a crx_file in the data directory.
 
     Args:
@@ skipping 113 matching lines @@
     # Give the system 30 seconds to go get this extension.  We are not sure how
     # long it will take the policy to take affect and download the extension.
     self.assertTrue(self.WaitUntil(lambda:
       self._CheckForExtensionByID(self._SCREEN_CAPTURE_CRX_ID),
       expect_retval=True),
       msg='The force install extension was never installed.')
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()