[protector] Disable the UI by default, flip --no-protector to --protector.

chrome/test/functional/protector.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 pyauto_functional  # Must be imported first
 import pyauto
 import test_utils
 
 import json
@@ skipping 16 matching lines @@
     pyauto.PyUITest.setUp(self)
     # Get the profile path of the first profile.
     profiles = self.GetMultiProfileInfo()
     self.assertTrue(profiles['profiles'])
     self._profile_path = profiles['profiles'][0]['path']
     self.assertTrue(self._profile_path)
     # Set to the keyword of the new default search engine after a successful
     # _GetDefaultSearchEngine call.
     self._new_default_search_keyword = None
 
+  def _IsEnabled(self):
+    """Whether protector should be enabled for the test suite."""
+    return True
+
+  def ExtraChromeFlags(self):
+    """Adds required Protector-related flags.
+
+    Returns:
+      A list of extra flags to pass to Chrome when it is launched.
+    """
+    return super(BaseProtectorTest, self).ExtraChromeFlags() + [
+        '--protector' if self._IsEnabled() else '--no-protector'
+        ]
+
   def _GetDefaultSearchEngine(self):
     """Returns the default search engine, if any; None otherwise.
 
     Returns:
        Dictionary describing the default search engine. See GetSearchEngineInfo
        for an example.
     """
     for search_engine in self.GetSearchEngineInfo():
       if search_engine['is_default']:
         return search_engine
@@ skipping 605 matching lines @@
     self.assertEquals(previous_homepage,
                       self.GetPrefsInfo().Prefs(pyauto.kHomePage))
     self.assertEquals(False, self.GetPrefsInfo().Prefs(pyauto.kShowHomeButton))
     # No longer showing the change
     self.assertFalse(self.GetProtectorState()['showing_change'])
 
 
 class ProtectorDisabledTest(BaseProtectorTest):
   """Test suite for Protector in disabled state."""
 
-  def ExtraChromeFlags(self):
-    """Ensures Protector is disabled.
-
-    Returns:
-      A list of extra flags to pass to Chrome when it is launched.
-    """
-    return super(ProtectorDisabledTest, self).ExtraChromeFlags() + [
-        '--no-protector'
-        ]
-
-  def testInfobarIsPresent(self):
-    """Verify that an infobar is present when running Chrome with --no-protector
-    flag.
-    """
-    self.assertTrue(self.GetBrowserInfo()['windows'][0]['tabs'][0]['infobars'])
+  def _IsEnabled(self):
+    """Overriden from BaseProtectorTest to disable Protector."""
+    return False
 
   def testNoSearchEngineChangeReported(self):
     """Test that the default search engine change is neither reported to user
     nor reverted.
     """
     # Get current search engine.
     old_default_search = self._GetDefaultSearchEngine()
     self.assertTrue(old_default_search)
     # Close browser, change the search engine and start it again.
     self.RestartBrowser(clear_profile=False,
@@ skipping 52 matching lines @@
         pre_launch_hook=lambda: self._ChangeHomepage(new_homepage, False, True))
     # Not showing the change.
     self.assertFalse(self.GetProtectorState()['showing_change'])
     # New values must be active.
     self.assertEquals(new_homepage, self.GetPrefsInfo().Prefs(pyauto.kHomePage))
     self.assertEquals(True, self.GetPrefsInfo().Prefs(pyauto.kShowHomeButton))
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()