Fix stack corruption bug in FilePathWatcherTest.Callback.

chrome/browser/policy/async_policy_provider.cc

 // Copyright (c) 2012 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/policy/async_policy_provider.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "chrome/browser/policy/async_policy_loader.h"
 #include "chrome/browser/policy/policy_bundle.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace policy {
 
-namespace {
-
-// Helper for a PostTaskAndReply used as a synchronization point between the
-// main thread and FILE thread. See AsyncPolicyProvider::RefreshPolicies.
-void Nop() {}
-
-}  // namespace
-
 AsyncPolicyProvider::AsyncPolicyProvider(scoped_ptr<AsyncPolicyLoader> loader)
     : loader_(loader.release()),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   // The FILE thread isn't ready early during startup. Post a task to the
   // current loop to resume initialization on FILE once the loops are spinning.
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&AsyncPolicyProvider::InitWithLoopsReady,
                  weak_factory_.GetWeakPtr()));
   // Make an immediate synchronous load on startup.
@@ skipping 23 matching lines @@
   // However, it's also possible that an asynchronous Reload() is in progress
   // and just posted OnLoaderReloaded(). Therefore a task is posted to the
   // FILE thread before posting the next Reload, to prevent a potential
   // concurrent Reload() from triggering a notification too early. If another
   // refresh task has been posted, it is invalidated now.
   refresh_callback_.Reset(
       base::Bind(&AsyncPolicyProvider::ReloadAfterRefreshSync,
                  base::Unretained(this)));
   BrowserThread::PostTaskAndReply(
       BrowserThread::FILE, FROM_HERE,
-      base::Bind(Nop),
+      base::Bind(base::DoNothing),
       refresh_callback_.callback());
 }
 
 void AsyncPolicyProvider::InitWithLoopsReady() {
   DCHECK(CalledOnValidThread());
   AsyncPolicyLoader::UpdateCallback callback =
       base::Bind(&AsyncPolicyProvider::LoaderUpdateCallback,
                  base::MessageLoopProxy::current(),
                  weak_factory_.GetWeakPtr());
   BrowserThread::PostTask(
@@ skipping 33 matching lines @@
     base::WeakPtr<AsyncPolicyProvider> weak_this,
     scoped_ptr<PolicyBundle> bundle) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   loop->PostTask(FROM_HERE,
                  base::Bind(&AsyncPolicyProvider::OnLoaderReloaded,
                             weak_this,
                             base::Passed(&bundle)));
 }
 
 }  // namespace policy