cros: Initialize screen_lock_connection_ to NULL in the ctor initializer list.

BUG=None
TEST=None

R=stevenjb@chromium.org

Review URL: http://codereview.chromium.org/7540006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94848 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/chromeos/cros/brightness_library.cc b/chrome/browser/chromeos/cros/brightness_library.cc
index 3e3e98e..a7b070e 100644
--- a/chrome/browser/chromeos/cros/brightness_library.cc
+++ b/chrome/browser/chromeos/cros/brightness_library.cc
@@ -71,8 +71,7 @@ class BrightnessLibraryImpl : public BrightnessLibrary {
       return;
     }
 
-    FOR_EACH_OBSERVER(Observer,
-                      observers_,
+    FOR_EACH_OBSERVER(Observer, observers_,
                       BrightnessChanged(brightness_level, user_initiated));
   }
 
diff --git a/chrome/browser/chromeos/cros/screen_lock_library.cc b/chrome/browser/chromeos/cros/screen_lock_library.cc
index f8aff15..fa6cbb8 100644
--- a/chrome/browser/chromeos/cros/screen_lock_library.cc
+++ b/chrome/browser/chromeos/cros/screen_lock_library.cc
@@ -17,11 +17,13 @@ namespace chromeos {
 
 class ScreenLockLibraryImpl : public ScreenLockLibrary {
  public:
-  ScreenLockLibraryImpl() {}
+  ScreenLockLibraryImpl() : screen_lock_connection_(NULL) {}
 
   virtual ~ScreenLockLibraryImpl() {
-    if (screen_lock_connection_)
+    if (screen_lock_connection_) {
       chromeos::DisconnectScreenLock(screen_lock_connection_);
+      screen_lock_connection_ = NULL;
+    }
   }
 
   // Begin ScreenLockLibrary implementation.
@@ -109,11 +111,10 @@ class ScreenLockLibraryImpl : public ScreenLockLibrary {
     FOR_EACH_OBSERVER(Observer, observers_, UnlockScreenFailed(this));
   }
 
-  ObserverList<Observer> observers_;
-
-  // A reference to the screen lock API.
   chromeos::ScreenLockConnection screen_lock_connection_;
 
+  ObserverList<Observer> observers_;
+
   DISALLOW_COPY_AND_ASSIGN(ScreenLockLibraryImpl);
 };