Fix build break in pyautolib with gcc >= 4.5.

Fix build break in pyautolib with gcc >= 4.5.
BUG=79710
See related issue http://code.google.com/p/chromium/issues/detail?id=49533 .

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=85018

[bungeman, 2011-04-18 03:35:03]

On 2011/04/18 03:22:35, bungeman wrote:

This is my first contribution, and I am not a committer. I have electronically
signed the CLA. Apparently I was supposed to put "Contributed by
bungeman@gmail.com" in the change description, but I didn't see that before as
it's at the very bottom of http://www.chromium.org/developers/contributing-code
and not mentioned in the section
http://www.chromium.org/developers/contributing-code#TOC-Create-a-change-list...
. Now I know :-).

[bungeman, 2011-05-04 05:22:34]

It has come to my attention that John Grabowski may no longer be active in this
area. Trying a new reviewer.

[Nirnimesh, 2011-05-04 18:45:39]

http://codereview.chromium.org/6877001/diff/1/chrome/test/pyautolib/pyautolib.cc
File chrome/test/pyautolib/pyautolib.cc (right):

http://codereview.chromium.org/6877001/diff/1/chrome/test/pyautolib/pyautolib...
chrome/test/pyautolib/pyautolib.cc:247: return NULL;
This should be changed to std::string("{}") to indicate a valid (but empty) json
string.

[bungeman, 2011-05-05 15:50:48]

On 2011/05/04 18:45:39, Nirnimesh wrote:
>
http://codereview.chromium.org/6877001/diff/1/chrome/test/pyautolib/pyautolib.cc
> File chrome/test/pyautolib/pyautolib.cc (right):
> 
>
http://codereview.chromium.org/6877001/diff/1/chrome/test/pyautolib/pyautolib...
> chrome/test/pyautolib/pyautolib.cc:247: return NULL;
> This should be changed to std::string("{}") to indicate a valid (but empty)
json
> string.

I have made a change here for GetBookmarkModel in pyauto.py to raise when this
situation is encountered. _GetBookmarksAsJSON is only called (and is internal
to) GetBookmarkModel. The string of json is only ever used to initialize the
BookmarkModel which GetBookmarkModel returns. The result of GetBookmarkModel is
then used primarily by /chrome/test/functional/bookmarks.py.

If pyautolib returns an empty object it will initialize the BookmarkModel, but
then there will be later (action at a distance) failures when the BookmarkModel
is actually used, as it is currently written to assume that the json is valid.
Since none of the existing code is handling this at the moment, it would be
better to fail early in this case. Also, raising in this case is consistent with
the other methods in pyauto.py.

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

Makes sense. LGTM

http://codereview.chromium.org/6877001/diff/4001/chrome/test/pyautolib/pyauto.py
File chrome/test/pyautolib/pyauto.py (right):

http://codereview.chromium.org/6877001/diff/4001/chrome/test/pyautolib/pyauto...
chrome/test/pyautolib/pyauto.py:537: bookmarksAsJSON =
self._GetBookmarksAsJSON()
nit: s/bookmarksAsJSON/bookmarks_as_json/

[bungeman, 2011-05-06 05:05:42]

Fixed nits.

[commit-bot: I haz the power, 2011-05-11 19:50:05]

Change committed as 85018