diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-09 17:01:37 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-09 17:01:37 +0000 |
| commit | 489d73e7fca72f29bd6620e268609133aa217795 (patch) | |
| tree | a3ea497ed6b15be2d9742821dd4a2f36a0d885ce /chrome/browser/sessions/base_session_service.cc | |
| parent | 60c413c96834553e182e8c9c34d1e8958f3b0fb5 (diff) | |
| download | chromium_src-489d73e7fca72f29bd6620e268609133aa217795.zip chromium_src-489d73e7fca72f29bd6620e268609133aa217795.tar.gz chromium_src-489d73e7fca72f29bd6620e268609133aa217795.tar.bz2 | |
Run more unit tests on Linux:
- used string16 instead of wstring where needed
- replaced GetTickCount calls with portable functions from base/time.h
- misc GCC cleanups
- enabled following unit tests on Linux:
browser/autocomplete/history_contents_provider_unittest.cc
browser/autocomplete/history_url_provider_unittest.cc
browser/autocomplete/keyword_provider_unittest.cc
browser/bookmarks/bookmark_html_writer_unittest.cc
Review URL: http://codereview.chromium.org/39335
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11249 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions/base_session_service.cc')
| -rw-r--r-- | chrome/browser/sessions/base_session_service.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sessions/base_session_service.cc b/chrome/browser/sessions/base_session_service.cc index 8423478..6548aa6 100644 --- a/chrome/browser/sessions/base_session_service.cc +++ b/chrome/browser/sessions/base_session_service.cc @@ -186,7 +186,7 @@ bool BaseSessionService::RestoreUpdateTabNavigationCommand( if (!pickle->ReadInt(&iterator, tab_id) || !pickle->ReadInt(&iterator, &(navigation->index_)) || !pickle->ReadString(&iterator, &url_spec) || - !pickle->ReadWString(&iterator, &(navigation->title_)) || + !pickle->ReadString16(&iterator, &(navigation->title_)) || !pickle->ReadString(&iterator, &(navigation->state_)) || !pickle->ReadInt(&iterator, reinterpret_cast<int*>(&(navigation->transition_)))) |