diff options
| author | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 00:22:56 +0000 |
|---|---|---|
| committer | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 00:22:56 +0000 |
| commit | 147167becd3bc65698ad8122461449256fbb7362 (patch) | |
| tree | 4c56e891779351c8c5e77b7d70bde582e4b683df | |
| parent | 9a8ea9255431c4565cfcacaa34efece9f7f01dd8 (diff) | |
| download | chromium_src-147167becd3bc65698ad8122461449256fbb7362.zip chromium_src-147167becd3bc65698ad8122461449256fbb7362.tar.gz chromium_src-147167becd3bc65698ad8122461449256fbb7362.tar.bz2 | |
Fix an unititialized variable that caused a mac valgrind failure.
BUG=46797
TEST=Mac valgrind stays green
Review URL: http://codereview.chromium.org/2849020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50675 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/cocoa/content_settings_dialog_controller.mm | 2 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions_mac.txt | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/chrome/browser/cocoa/content_settings_dialog_controller.mm b/chrome/browser/cocoa/content_settings_dialog_controller.mm index c0f7e57..d909b05 100644 --- a/chrome/browser/cocoa/content_settings_dialog_controller.mm +++ b/chrome/browser/cocoa/content_settings_dialog_controller.mm @@ -74,7 +74,7 @@ namespace ContentSettingsDialogControllerInternal { class PrefObserverBridge : public NotificationObserver { public: PrefObserverBridge(ContentSettingsDialogController* controller) - : controller_(controller) {} + : controller_(controller), disabled_(false) {} virtual ~PrefObserverBridge() {} diff --git a/tools/valgrind/memcheck/suppressions_mac.txt b/tools/valgrind/memcheck/suppressions_mac.txt index 7a7ab33..798fca9 100644 --- a/tools/valgrind/memcheck/suppressions_mac.txt +++ b/tools/valgrind/memcheck/suppressions_mac.txt @@ -1204,15 +1204,6 @@ fun:thread_start } { - bug_46797 - Memcheck:Cond - fun:_ZN39ContentSettingsDialogControllerInternal18PrefObserverBridge7ObserveE16NotificationTypeRK18NotificationSourceRK19NotificationDetails - ... - fun:_ZN11PrefService13FireObserversEPKw - ... - fun:_ZN12_GLOBAL__N_*ContentSettingsDialogControllerTest_* -} -{ bug_47330 Memcheck:Leak fun:_Znw* |