| Index: chrome/browser/chromeos/login/owner_manager_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/chromeos/login/owner_manager_unittest.cc (revision 91880)
|
| +++ chrome/browser/chromeos/login/owner_manager_unittest.cc (working copy)
|
| @@ -36,11 +36,11 @@
|
| observed_(false) {
|
| registrar_.Add(
|
| this,
|
| - NotificationType::OWNER_KEY_FETCH_ATTEMPT_FAILED,
|
| + chrome::OWNER_KEY_FETCH_ATTEMPT_FAILED,
|
| NotificationService::AllSources());
|
| registrar_.Add(
|
| this,
|
| - NotificationType::OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED,
|
| + chrome::OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED,
|
| NotificationService::AllSources());
|
| }
|
|
|
| @@ -48,16 +48,16 @@
|
| DCHECK(observed_);
|
| }
|
|
|
| -void MockKeyLoadObserver::Observe(NotificationType type,
|
| +void MockKeyLoadObserver::Observe(int type,
|
| const NotificationSource& source,
|
| const NotificationDetails& details) {
|
| LOG(INFO) << "Observed key fetch event";
|
| - if (type == NotificationType::OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED) {
|
| + if (type == chrome::OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED) {
|
| DCHECK(success_expected_);
|
| observed_ = true;
|
| if (event_)
|
| event_->Signal();
|
| - } else if (type == NotificationType::OWNER_KEY_FETCH_ATTEMPT_FAILED) {
|
| + } else if (type == chrome::OWNER_KEY_FETCH_ATTEMPT_FAILED) {
|
| DCHECK(!success_expected_);
|
| observed_ = true;
|
| if (event_)
|
|
|