Prefer ScopedNestableTaskAllower over manual save/restore

chrome/browser/sync/profile_sync_service_harness.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/sync/profile_sync_service_harness.h"
 
 #include <cstddef>
 #include <iterator>
 #include <ostream>
 #include <set>
@@ skipping 728 matching lines @@
 bool ProfileSyncServiceHarness::AwaitStatusChangeWithTimeout(
     int timeout_milliseconds,
     const std::string& reason) {
   DVLOG(1) << GetClientInfoString("AwaitStatusChangeWithTimeout");
   if (wait_state_ == SYNC_DISABLED) {
     LOG(ERROR) << "Sync disabled for " << profile_debug_name_ << ".";
     return false;
   }
   scoped_refptr<StateChangeTimeoutEvent> timeout_signal(
       new StateChangeTimeoutEvent(this, reason));
+

[jar (doing other things), 2012/02/11 03:24:38]

nit: You probably don't need the black line.

[dhollowa, 2012/02/13 17:44:26]

Done.

   MessageLoop* loop = MessageLoop::current();
-  bool did_allow_nestable_tasks = loop->NestableTasksAllowed();
-  loop->SetNestableTasksAllowed(true);
+  MessageLoop::ScopedNestableTaskAllower allow(loop);
   loop->PostDelayedTask(
       FROM_HERE,
       base::Bind(&StateChangeTimeoutEvent::Callback,
                  timeout_signal.get()),
       base::TimeDelta::FromMilliseconds(timeout_milliseconds));
   loop->Run();
-  loop->SetNestableTasksAllowed(did_allow_nestable_tasks);
+
   if (timeout_signal->Abort()) {

[Ryan Sleevi, 2012/02/11 02:17:22]

Is it any concern that this call now runs while nestable tasks are still
allowed?

[jar (doing other things), 2012/02/11 03:24:38]

+1

Please enclose lines 751 to 757 in a local scope.

On 2012/02/11 02:17:22, Ryan Sleevi wrote:

[dhollowa, 2012/02/13 17:44:26]

I'd left it out for readability, the signal manipulation is not relevant to the
nestability.  But I'm fine to scope it explicitly too.  So have done that.

[dhollowa, 2012/02/13 17:44:26]

Done.

     DVLOG(1) << GetClientInfoString("AwaitStatusChangeWithTimeout succeeded");
     return true;
   } else {
     DVLOG(0) << GetClientInfoString("AwaitStatusChangeWithTimeout timed out");
     return false;
   }
 }
 
 ProfileSyncService::Status ProfileSyncServiceHarness::GetStatus() {
   DCHECK(service() != NULL) << "GetStatus(): service() is NULL.";
@@ skipping 346 matching lines @@
   return state_map.size();
 }
 
 std::string ProfileSyncServiceHarness::GetServiceStatus() {
   DictionaryValue value;
   sync_ui_util::ConstructAboutInformation(service_, &value);
   std::string service_status;
   base::JSONWriter::Write(&value, true, &service_status);
   return service_status;
 }