cros: Remove the unneed default ctor from ScreenLockLibrary interface.

chrome/browser/chromeos/cros/screen_lock_library.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/cros/screen_lock_library.h"
 
+#include "base/basictypes.h"
+#include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/string_util.h"
+#include "base/observer_list.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "content/browser/browser_thread.h"
+#include "third_party/cros/chromeos_screen_lock.h"
 
 namespace chromeos {
 
-// This class handles the interaction with the ChromeOS screen lock APIs.
 class ScreenLockLibraryImpl : public ScreenLockLibrary {
  public:
   ScreenLockLibraryImpl() {
-    if (CrosLibrary::Get()->EnsureLoaded()) {
+    if (CrosLibrary::Get()->EnsureLoaded())

[stevenjb, 2011/07/28 01:23:30]

Init() should not get called in the constructor, it should get called from
GetImpl().
Also, we should move the EnsureLoaded() check into Init() surrounding the
libcros call.

[tfarina, 2011/07/28 01:37:28]

By this, you mean:
ScreeLockLibrary* ScreenLockLibrary::GetImpl(bool stub) {
  if (stub)
    return new ScreenLockLibraryStubImpl();
  else {
    ScreenLockLibraryImpl* lib = new ScreenLockLibraryImpl();
    lib->Init();
    return lib;
  }
}

       Init();
-    }
   }
 
   ~ScreenLockLibraryImpl() {
-    if (screen_lock_connection_) {
+    if (screen_lock_connection_)
       chromeos::DisconnectScreenLock(screen_lock_connection_);
-    }
   }
 
   void AddObserver(Observer* observer) {
     observers_.AddObserver(observer);
   }
 
   void RemoveObserver(Observer* observer) {
     observers_.RemoveObserver(observer);
   }
 
   void NotifyScreenLockRequested() {
     chromeos::NotifyScreenLockRequested();
   }
 
   void NotifyScreenLockCompleted() {
     chromeos::NotifyScreenLockCompleted();
   }
 
   void NotifyScreenUnlockRequested() {
     chromeos::NotifyScreenUnlockRequested();
   }
 
   void NotifyScreenUnlockCompleted() {
     chromeos::NotifyScreenUnlockCompleted();
   }
 
  private:
+  static void ScreenLockedHandler(void* object, ScreenLockEvent event) {
+    ScreenLockLibraryImpl* self = static_cast<ScreenLockLibraryImpl*>(object);
+    switch (event) {
+      case chromeos::LockScreen:
+        self->LockScreen();
+        break;
+      case chromeos::UnlockScreen:
+        self->UnlockScreen();
+        break;
+      case chromeos::UnlockScreenFailed:
+        self->UnlockScreenFailed();
+        break;
+      default:
+        NOTREACHED();
+        break;
+    }
+  }
+
   void Init() {
-    screen_lock_connection_ = chromeos::MonitorScreenLock(
-        &ScreenLockedHandler, this);
+    screen_lock_connection_ =
+        chromeos::MonitorScreenLock(&ScreenLockedHandler, this);
   }
 
   void LockScreen() {
     // Make sure we run on UI thread.
     if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
       BrowserThread::PostTask(
           BrowserThread::UI, FROM_HERE,
           NewRunnableMethod(this, &ScreenLockLibraryImpl::LockScreen));
       return;
     }
@@ skipping 15 matching lines @@
     // Make sure we run on UI thread.
     if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
       BrowserThread::PostTask(
           BrowserThread::UI, FROM_HERE,
           NewRunnableMethod(this, &ScreenLockLibraryImpl::UnlockScreenFailed));
       return;
     }
     FOR_EACH_OBSERVER(Observer, observers_, UnlockScreenFailed(this));
   }
 
-  static void ScreenLockedHandler(void* object, ScreenLockEvent event) {
-    ScreenLockLibraryImpl* self = static_cast<ScreenLockLibraryImpl*>(object);
-    switch (event) {
-      case chromeos::LockScreen:
-        self->LockScreen();
-        break;
-      case chromeos::UnlockScreen:
-        self->UnlockScreen();
-        break;
-      case chromeos::UnlockScreenFailed:
-        self->UnlockScreenFailed();
-        break;
-      default:
-        NOTREACHED();
-    }
-  }
-
   ObserverList<Observer> observers_;
 
-  // A reference to the screen lock api
+  // A reference to the screen lock API.
   chromeos::ScreenLockConnection screen_lock_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenLockLibraryImpl);
 };
 
 class ScreenLockLibraryStubImpl : public ScreenLockLibrary {
  public:
   ScreenLockLibraryStubImpl() {}
   ~ScreenLockLibraryStubImpl() {}
   void AddObserver(Observer* observer) {}

[tfarina, 2011/07/28 01:00:50]

These all needs "virtual" and OVERRIDE. And the above methods too. For a follow
up patch though.

   void RemoveObserver(Observer* observer) {}
   void NotifyScreenLockRequested() {}
   void NotifyScreenLockCompleted() {}
   void NotifyScreenUnlockRequested() {}
   void NotifyScreenUnlockCompleted() {}
 };
 
 // static
 ScreenLockLibrary* ScreenLockLibrary::GetImpl(bool stub) {
   if (stub)
     return new ScreenLockLibraryStubImpl();
   else
     return new ScreenLockLibraryImpl();
 }
 
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::ScreenLockLibraryImpl);