diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 16:13:23 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 16:13:23 +0000 |
| commit | fa6bbfcb35d9bd04dd165fb0003d54fc858086cb (patch) | |
| tree | 1e1e673b8e9fc633f4d1c12860c3782633d381f9 /chrome/chrome_tests.gypi | |
| parent | 5a84c8c30ca08f5bdc1594bf25a4b9c3deec8cff (diff) | |
| download | chromium_src-fa6bbfcb35d9bd04dd165fb0003d54fc858086cb.zip chromium_src-fa6bbfcb35d9bd04dd165fb0003d54fc858086cb.tar.gz chromium_src-fa6bbfcb35d9bd04dd165fb0003d54fc858086cb.tar.bz2 | |
Merge 62789 - [Sync] fix about:sync crash with unrecoverable error
If the client had encountered an unrecoverable error typing about:sync would crash because the client code would try to dereference the backendhost for the purpose of printing the model group information(by this time backendhost would have been released). The fix is to bail out of printing the model information if the client had encountered an unrecoverable error. however we would still print the client had encountered an urecoverable error and the line number etc.
In the process moved a bunch of code related to collecting about information for sync, from browser_about_handler.cc to sync_ui_util.cc. The refactoing helps us in unit testing by passing in a mock service object.
BUG=55503
TEST=Wrote a new unit test for it. ConstructAboutInformationWithUnrecoverableErrorTest. Also tested by pretending one of the datatypes generated an unrecoverable error in the debugger.
Original patch by lipalani@google.com
Original review: http://codereview.chromium.org/3715002
Review URL: http://codereview.chromium.org/3810011
TBR=akalin@chromium.org
Review URL: http://codereview.chromium.org/4146013
git-svn-id: svn://svn.chromium.org/chrome/branches/552/src@64432 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 42c7b6f..b7c5578 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1476,6 +1476,7 @@ 'browser/sync/signin_manager_unittest.cc', 'browser/sync/sync_setup_wizard_unittest.cc', 'browser/sync/sync_ui_util_mac_unittest.mm', + 'browser/sync/sync_ui_util_unittest.cc', 'browser/sync/test_profile_sync_service.h', 'browser/sync/util/cryptographer_unittest.cc', 'browser/sync/util/nigori_unittest.cc', |