| Index: chrome/browser/policy/configuration_policy_loader_win.cc
|
| diff --git a/chrome/browser/policy/configuration_policy_loader_win.cc b/chrome/browser/policy/configuration_policy_loader_win.cc
|
| index 68ccf808d9b8d1f3b86e4e7064d0bf95a101d76a..7ad68635d4adaa5d2ed1422a7c4b85eeea5737e2 100644
|
| --- a/chrome/browser/policy/configuration_policy_loader_win.cc
|
| +++ b/chrome/browser/policy/configuration_policy_loader_win.cc
|
| @@ -1,4 +1,4 @@
|
| -// 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.
|
|
|
| @@ -31,13 +31,11 @@ ConfigurationPolicyLoaderWin::ConfigurationPolicyLoaderWin(
|
| void ConfigurationPolicyLoaderWin::InitOnFileThread() {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
|
| AsynchronousPolicyLoader::InitOnFileThread();
|
| - MessageLoop::current()->AddDestructionObserver(this);
|
| SetupWatches();
|
| }
|
|
|
| void ConfigurationPolicyLoaderWin::StopOnFileThread() {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
|
| - MessageLoop::current()->RemoveDestructionObserver(this);
|
| user_policy_watcher_.StopWatching();
|
| machine_policy_watcher_.StopWatching();
|
| AsynchronousPolicyLoader::StopOnFileThread();
|
| @@ -81,10 +79,4 @@ void ConfigurationPolicyLoaderWin::OnObjectSignaled(HANDLE object) {
|
| Reload();
|
| }
|
|
|
| -void ConfigurationPolicyLoaderWin::
|
| - WillDestroyCurrentMessageLoop() {
|
| - CancelReloadTask();
|
| - MessageLoop::current()->RemoveDestructionObserver(this);
|
| -}
|
| -
|
| } // namespace policy
|
|
|