Fix build break in pyautolib with gcc >= 4.5.

chrome/test/pyautolib/pyauto.py

 #!/usr/bin/python
 
 # 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.
 
 """PyAuto: Python Interface to Chromium's Automation Proxy.
 
 PyAuto uses swig to expose Automation Proxy interfaces to Python.
 For complete documentation on the functionality available,
@@ skipping 516 matching lines @@
     if ret_dict.has_key('error'):
       raise JSONInterfaceError(ret_dict['error'])
     return ret_dict
 
   def GetBookmarkModel(self):
     """Return the bookmark model as a BookmarkModel object.
 
     This is a snapshot of the bookmark model; it is not a proxy and
     does not get updated as the bookmark model changes.
     """
-    return bookmark_model.BookmarkModel(self._GetBookmarksAsJSON())
+    bookmarksAsJSON = self._GetBookmarksAsJSON()

[Nirnimesh, 2011/05/05 23:02:01]

nit: s/bookmarksAsJSON/bookmarks_as_json/

+    if bookmarksAsJSON == None:
+      raise JSONInterfaceError('Could not resolve browser proxy.')
+    return bookmark_model.BookmarkModel(bookmarksAsJSON)
 
   def GetDownloadsInfo(self, windex=0):
     """Return info about downloads.
 
     This includes all the downloads recognized by the history system.
 
     Returns:
       an instance of downloads_info.DownloadInfo
     """
     return download_info.DownloadInfo(
@@ skipping 2814 matching lines @@
     if self._options.verbose:
       verbosity = 2
     result = PyAutoTextTestRuner(verbosity=verbosity).run(pyauto_suite)
     del loaded_tests  # Need to destroy test cases before the suite
     del pyauto_suite
     sys.exit(not result.wasSuccessful())
 
 
 if __name__ == '__main__':
   Main()