chromeos: Remove ScreenLockLibrary.

BUG=chromium-os:16659
TEST=chrome and tests build


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

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

11 files changed, 2 insertions, 263 deletions

diff --git a/chrome/browser/chromeos/cros/cros_library.cc b/chrome/browser/chromeos/cros/cros_library.cc
index 3e84fb1..41f6353 100644
--- a/chrome/browser/chromeos/cros/cros_library.cc
+++ b/chrome/browser/chromeos/cros/cros_library.cc
@@ -9,7 +9,6 @@
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/cros/library_loader.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/chromeos/cros/screen_lock_library.h"
 #include "third_party/cros/chromeos_cros_api.h"
 
 // Pass !libcros_loaded_ to GetDefaultImpl instead of use_stub_impl_ so that
@@ -80,7 +79,6 @@ DEFINE_GET_LIBRARY_METHOD(Burn, burn);
 DEFINE_GET_LIBRARY_METHOD(Cert, cert);
 DEFINE_GET_LIBRARY_METHOD(Cryptohome, crypto);
 DEFINE_GET_LIBRARY_METHOD(Network, network);
-DEFINE_GET_LIBRARY_METHOD(ScreenLock, screen_lock);
 
 bool CrosLibrary::LoadLibcros() {
   if (!libcros_loaded_ && !load_error_) {
@@ -123,6 +121,5 @@ DEFINE_SET_LIBRARY_METHOD(Cert, cert);
 DEFINE_SET_LIBRARY_METHOD(Burn, burn);
 DEFINE_SET_LIBRARY_METHOD(Cryptohome, crypto);
 DEFINE_SET_LIBRARY_METHOD(Network, network);
-DEFINE_SET_LIBRARY_METHOD(ScreenLock, screen_lock);
 
 } // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/cros_library.h b/chrome/browser/chromeos/cros/cros_library.h
index 2453515..2f06b76 100644
--- a/chrome/browser/chromeos/cros/cros_library.h
+++ b/chrome/browser/chromeos/cros/cros_library.h
@@ -21,7 +21,6 @@ class CertLibrary;
 class CryptohomeLibrary;
 class LibraryLoader;
 class NetworkLibrary;
-class ScreenLockLibrary;
 
 // This class handles access to sub-parts of ChromeOS library. it provides
 // a level of indirection so individual libraries that it exposes can
@@ -45,7 +44,6 @@ class CrosLibrary {
     void SetBurnLibrary(BurnLibrary* library, bool own);
     void SetCryptohomeLibrary(CryptohomeLibrary* library, bool own);
     void SetNetworkLibrary(NetworkLibrary* library, bool own);
-    void SetScreenLockLibrary(ScreenLockLibrary* library, bool own);
 
    private:
     friend class CrosLibrary;
@@ -68,7 +66,6 @@ class CrosLibrary {
   CertLibrary* GetCertLibrary();
   CryptohomeLibrary* GetCryptohomeLibrary();
   NetworkLibrary* GetNetworkLibrary();
-  ScreenLockLibrary* GetScreenLockLibrary();
 
   // Getter for Test API that gives access to internal members of this class.
   TestApi* GetTestApi();
@@ -131,7 +128,6 @@ class CrosLibrary {
   Library<CertLibrary> cert_lib_;
   Library<CryptohomeLibrary> crypto_lib_;
   Library<NetworkLibrary> network_lib_;
-  Library<ScreenLockLibrary> screen_lock_lib_;
 
   // Stub implementations of the libraries should be used.
   bool use_stub_impl_;
diff --git a/chrome/browser/chromeos/cros/cros_mock.cc b/chrome/browser/chromeos/cros/cros_mock.cc
index 36b10c8..ae816b9 100644
--- a/chrome/browser/chromeos/cros/cros_mock.cc
+++ b/chrome/browser/chromeos/cros/cros_mock.cc
@@ -10,7 +10,6 @@
 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
 #include "chrome/browser/chromeos/cros/mock_library_loader.h"
 #include "chrome/browser/chromeos/cros/mock_network_library.h"
-#include "chrome/browser/chromeos/cros/mock_screen_lock_library.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/login/wizard_screen.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ -32,8 +31,7 @@ using ::testing::_;
 CrosMock::CrosMock()
     : loader_(NULL),
       mock_cryptohome_library_(NULL),
-      mock_network_library_(NULL),
-      mock_screen_lock_library_(NULL) {
+      mock_network_library_(NULL) {
 }
 
 CrosMock::~CrosMock() {
@@ -73,14 +71,6 @@ void CrosMock::InitMockNetworkLibrary() {
   test_api()->SetNetworkLibrary(mock_network_library_, true);
 }
 
-void CrosMock::InitMockScreenLockLibrary() {
-  InitMockLibraryLoader();
-  if (mock_screen_lock_library_)
-    return;
-  mock_screen_lock_library_ = new StrictMock<MockScreenLockLibrary>();
-  test_api()->SetScreenLockLibrary(mock_screen_lock_library_, true);
-}
-
 // Initialization of mocks.
 MockCryptohomeLibrary* CrosMock::mock_cryptohome_library() {
   return mock_cryptohome_library_;
@@ -90,10 +80,6 @@ MockNetworkLibrary* CrosMock::mock_network_library() {
   return mock_network_library_;
 }
 
-MockScreenLockLibrary* CrosMock::mock_screen_lock_library() {
-  return mock_screen_lock_library_;
-}
-
 void CrosMock::SetStatusAreaMocksExpectations() {
   SetNetworkLibraryStatusAreaExpectations();
 }
@@ -211,8 +197,6 @@ void CrosMock::TearDownMocks() {
     test_api()->SetCryptohomeLibrary(NULL, false);
   if (mock_network_library_)
     test_api()->SetNetworkLibrary(NULL, false);
-  if (mock_screen_lock_library_)
-    test_api()->SetScreenLockLibrary(NULL, false);
 }
 
 }  // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/cros_mock.h b/chrome/browser/chromeos/cros/cros_mock.h
index 0484bf1..648e89b 100644
--- a/chrome/browser/chromeos/cros/cros_mock.h
+++ b/chrome/browser/chromeos/cros/cros_mock.h
@@ -15,7 +15,6 @@ class MockCryptohomeLibrary;
 class MockKeyboardLibrary;
 class MockLibraryLoader;
 class MockNetworkLibrary;
-class MockScreenLockLibrary;
 
 // Class for initializing mocks for some parts of CrosLibrary. Once you mock
 // part of CrosLibrary it will be considered as successfully loaded and
@@ -41,13 +40,11 @@ class CrosMock {
   void InitMockCryptohomeLibrary();
   void InitMockKeyboardLibrary();
   void InitMockNetworkLibrary();
-  void InitMockScreenLockLibrary();
 
   // Get mocks.
   MockCryptohomeLibrary* mock_cryptohome_library();
   MockKeyboardLibrary* mock_keyboard_library();
   MockNetworkLibrary* mock_network_library();
-  MockScreenLockLibrary* mock_screen_lock_library();
 
   // This method sets up corresponding expectations for basic mocks that
   // are used by status area items.
@@ -72,7 +69,6 @@ class CrosMock {
   MockCryptohomeLibrary* mock_cryptohome_library_;
   MockKeyboardLibrary* mock_keyboard_library_;
   MockNetworkLibrary* mock_network_library_;
-  MockScreenLockLibrary* mock_screen_lock_library_;
 
   WifiNetworkVector wifi_networks_;
   CellularNetworkVector cellular_networks_;
diff --git a/chrome/browser/chromeos/cros/mock_screen_lock_library.cc b/chrome/browser/chromeos/cros/mock_screen_lock_library.cc
deleted file mode 100644
index 48cc064..0000000
--- a/chrome/browser/chromeos/cros/mock_screen_lock_library.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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/mock_screen_lock_library.h"
-
-namespace chromeos {
-
-MockScreenLockLibrary::MockScreenLockLibrary() {}
-
-MockScreenLockLibrary::~MockScreenLockLibrary() {}
-
-}  // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/mock_screen_lock_library.h b/chrome/browser/chromeos/cros/mock_screen_lock_library.h
deleted file mode 100644
index 4034aef..0000000
--- a/chrome/browser/chromeos/cros/mock_screen_lock_library.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_CROS_MOCK_SCREEN_LOCK_LIBRARY_H_
-#define CHROME_BROWSER_CHROMEOS_CROS_MOCK_SCREEN_LOCK_LIBRARY_H_
-#pragma once
-
-#include "chrome/browser/chromeos/cros/screen_lock_library.h"
-#include "testing/gmock/include/gmock/gmock.h"
-
-namespace chromeos {
-
-class MockScreenLockLibrary : public ScreenLockLibrary {
- public:
-  MockScreenLockLibrary();
-  virtual ~MockScreenLockLibrary();
-
-  MOCK_METHOD0(Init, void());
-
-  MOCK_METHOD1(AddObserver, void(Observer*));
-  MOCK_METHOD1(RemoveObserver, void(Observer*));
-
-  MOCK_METHOD0(NotifyScreenLockRequested, void());
-  MOCK_METHOD0(NotifyScreenLockCompleted, void());
-  MOCK_METHOD0(NotifyScreenUnlockRequested, void());
-  MOCK_METHOD0(NotifyScreenUnlockCompleted, void());
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_CROS_MOCK_SCREEN_LOCK_LIBRARY_H_
diff --git a/chrome/browser/chromeos/cros/screen_lock_library.cc b/chrome/browser/chromeos/cros/screen_lock_library.cc
deleted file mode 100644
index 06537fa..0000000
--- a/chrome/browser/chromeos/cros/screen_lock_library.cc
+++ /dev/null
@@ -1,134 +0,0 @@
-// 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/compiler_specific.h"
-#include "base/logging.h"
-#include "base/message_loop.h"
-#include "base/observer_list.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "content/public/browser/browser_thread.h"
-#include "third_party/cros/chromeos_screen_lock.h"
-
-using content::BrowserThread;
-
-namespace chromeos {
-
-class ScreenLockLibraryImpl : public ScreenLockLibrary {
- public:
-  ScreenLockLibraryImpl() : screen_lock_connection_(NULL) {}
-
-  virtual ~ScreenLockLibraryImpl() {
-    if (screen_lock_connection_) {
-      chromeos::DisconnectScreenLock(screen_lock_connection_);
-      screen_lock_connection_ = NULL;
-    }
-  }
-
-  // Begin ScreenLockLibrary implementation.
-  virtual void Init() OVERRIDE {
-    DCHECK(CrosLibrary::Get()->libcros_loaded());
-    screen_lock_connection_ =
-        chromeos::MonitorScreenLock(&ScreenLockedHandler, this);
-  }
-
-  virtual void AddObserver(Observer* observer) OVERRIDE {
-    observers_.AddObserver(observer);
-  }
-
-  virtual void RemoveObserver(Observer* observer) OVERRIDE {
-    observers_.RemoveObserver(observer);
-  }
-
-  virtual void NotifyScreenLockRequested() OVERRIDE {
-    chromeos::NotifyScreenLockRequested();
-  }
-
-  virtual void NotifyScreenLockCompleted() OVERRIDE {
-    chromeos::NotifyScreenLockCompleted();
-  }
-
-  virtual void NotifyScreenUnlockRequested() OVERRIDE {
-    chromeos::NotifyScreenUnlockRequested();
-  }
-
-  virtual void NotifyScreenUnlockCompleted() OVERRIDE {
-    chromeos::NotifyScreenUnlockCompleted();
-  }
-  // End ScreenLockLibrary implementation.
-
- 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 LockScreen() {
-    // Called from ScreenLockedHandler, a libcros callback which should
-    // always run on UI thread.
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-    FOR_EACH_OBSERVER(Observer, observers_, LockScreen(this));
-  }
-
-  void UnlockScreen() {
-    // Called from ScreenLockedHandler, a libcros callback which should
-    // always run on UI thread.
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-    FOR_EACH_OBSERVER(Observer, observers_, UnlockScreen(this));
-  }
-
-  void UnlockScreenFailed() {
-    // Called from ScreenLockedHandler, a libcros callback which should
-    // always run on UI thread.
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-    FOR_EACH_OBSERVER(Observer, observers_, UnlockScreenFailed(this));
-  }
-
-  chromeos::ScreenLockConnection screen_lock_connection_;
-
-  ObserverList<Observer> observers_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScreenLockLibraryImpl);
-};
-
-class ScreenLockLibraryStubImpl : public ScreenLockLibrary {
- public:
-  ScreenLockLibraryStubImpl() {}
-  virtual ~ScreenLockLibraryStubImpl() {}
-  virtual void Init() OVERRIDE {}
-  virtual void AddObserver(Observer* observer) OVERRIDE {}
-  virtual void RemoveObserver(Observer* observer) OVERRIDE {}
-  virtual void NotifyScreenLockRequested() OVERRIDE {}
-  virtual void NotifyScreenLockCompleted() OVERRIDE {}
-  virtual void NotifyScreenUnlockRequested() OVERRIDE {}
-  virtual void NotifyScreenUnlockCompleted() OVERRIDE {}
-};
-
-// static
-ScreenLockLibrary* ScreenLockLibrary::GetImpl(bool stub) {
-  ScreenLockLibrary* impl;
-  if (stub)
-    impl = new ScreenLockLibraryStubImpl();
-  else
-    impl = new ScreenLockLibraryImpl();
-  impl->Init();
-  return impl;
-}
-
-}  // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/screen_lock_library.h b/chrome/browser/chromeos/cros/screen_lock_library.h
deleted file mode 100644
index 41b2f90..0000000
--- a/chrome/browser/chromeos/cros/screen_lock_library.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_CROS_SCREEN_LOCK_LIBRARY_H_
-#define CHROME_BROWSER_CHROMEOS_CROS_SCREEN_LOCK_LIBRARY_H_
-#pragma once
-
-namespace chromeos {
-
-// This interface handles the interaction with the ChromeOS screen lock API.
-class ScreenLockLibrary {
- public:
-  class Observer {
-   public:
-    virtual ~Observer() {}
-
-    virtual void LockScreen(ScreenLockLibrary* obj) = 0;
-    virtual void UnlockScreen(ScreenLockLibrary* obj) = 0;
-    virtual void UnlockScreenFailed(ScreenLockLibrary* obj) = 0;
-  };
-
-  virtual ~ScreenLockLibrary() {}
-
-  virtual void Init() = 0;
-
-  virtual void AddObserver(Observer* observer) = 0;
-  virtual void RemoveObserver(Observer* observer) = 0;
-
-  // Notifies PowerManager that a user requested to lock the screen.
-  virtual void NotifyScreenLockRequested() = 0;
-
-  // Notifies PowerManager that screen lock has been completed.
-  virtual void NotifyScreenLockCompleted() = 0;
-
-  // Notifies PowerManager that a user unlocked the screen.
-  virtual void NotifyScreenUnlockRequested() = 0;
-
-  // Notifies PowerManager that screen is unlocked.
-  virtual void NotifyScreenUnlockCompleted() = 0;
-
-  // Factory function, creates a new instance and returns ownership.
-  // For normal usage, access the singleton via CrosLibrary::Get().
-  static ScreenLockLibrary* GetImpl(bool stub);
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_CROS_SCREEN_LOCK_LIBRARY_H_
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 9a049a1..113a8ed 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -190,8 +190,6 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_loader.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/screen_lock_library.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/ui/webui/active_downloads_ui.h"
@@ -2264,7 +2262,7 @@ void Browser::OpenFileManager() {
 #if defined(OS_CHROMEOS)
 void Browser::LockScreen() {
   content::RecordAction(UserMetricsAction("LockScreen"));
-  chromeos::CrosLibrary::Get()->GetScreenLockLibrary()->
+  chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       NotifyScreenLockRequested();
 }
 
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 1f3dd40..e99bf1d 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -435,8 +435,6 @@
         'browser/chromeos/cros/network_ui_data.h',
         'browser/chromeos/cros/onc_network_parser.cc',
         'browser/chromeos/cros/onc_network_parser.h',
-        'browser/chromeos/cros/screen_lock_library.cc',
-        'browser/chromeos/cros/screen_lock_library.h',
         'browser/chromeos/cros_settings.cc',
         'browser/chromeos/cros_settings.h',
         'browser/chromeos/cros_settings_names.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index cc7b31a..cd5ca98 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2440,8 +2440,6 @@
         'browser/chromeos/cros/cros_in_process_browser_test.h',
         'browser/chromeos/cros/cros_mock.cc',
         'browser/chromeos/cros/cros_mock.h',
-        'browser/chromeos/cros/mock_screen_lock_library.cc',
-        'browser/chromeos/cros/mock_screen_lock_library.h',
         'browser/chromeos/disks/mock_disk_mount_manager.cc',
         'browser/chromeos/disks/mock_disk_mount_manager.h',
         'browser/chromeos/extensions/file_browser_notifications_browsertest.cc',