Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(519)

Unified Diff: chrome/test/pyautolib/pyauto.py

Issue 6877001: Fix build break in pyautolib with gcc >= 4.5. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/test/pyautolib/pyautolib.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/pyautolib/pyauto.py
===================================================================
--- chrome/test/pyautolib/pyauto.py (revision 84245)
+++ chrome/test/pyautolib/pyauto.py (working copy)
@@ -534,7 +534,10 @@
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())
+ bookmarks_as_json = self._GetBookmarksAsJSON()
+ if bookmarks_as_json == None:
+ raise JSONInterfaceError('Could not resolve browser proxy.')
+ return bookmark_model.BookmarkModel(bookmarks_as_json)
def GetDownloadsInfo(self, windex=0):
"""Return info about downloads.
« no previous file with comments | « no previous file | chrome/test/pyautolib/pyautolib.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698