Clean up after each MemoryCoordinatorImpl test

content/browser/memory/memory_coordinator_impl.cc

 // Copyright 2016 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 "content/browser/memory/memory_coordinator_impl.h"
 
 #include "base/memory/memory_coordinator_client_registry.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/process/process_handle.h"
@@ skipping 158 matching lines @@
 MemoryCoordinatorImpl::MemoryCoordinatorImpl(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
     std::unique_ptr<MemoryMonitor> memory_monitor)
     : delegate_(GetContentClient()->browser()->GetMemoryCoordinatorDelegate()),
       memory_monitor_(std::move(memory_monitor)),
       state_updater_(base::MakeUnique<MemoryStateUpdater>(this, task_runner)) {
   DCHECK(memory_monitor_.get());
   base::MemoryCoordinatorProxy::SetMemoryCoordinator(this);
 }
 
-MemoryCoordinatorImpl::~MemoryCoordinatorImpl() {}
+MemoryCoordinatorImpl::~MemoryCoordinatorImpl() {
+  base::MemoryCoordinatorProxy::ResetGlobals();

[sadrul, 2017/03/03 17:40:41]

Maybe this could just call:
  base::MemoryCoordinatorProxy::SetMemoryCoordinator(nullptr)?

and SetMemoryCoordinator() could be updated to allow this?

[dimaa1, 2017/03/03 18:30:05]

These tests are failing because we execute this method when globals are not
reseted. We are getting crash because of the line
"DCHECK(!g_memory_coordinator);" inside that method. That is why we need to use
different way to reset it.

[sadrul, 2017/03/03 18:45:01]

Yep. That's what I suggested SetMemoryCoordinator() would need to also be
updated. For example, instead of:

  DCHECK(!g_memory_coordinator);

it could check:

  DCHECK(!g_memory_coordinator || !coordinator);

i.e. you can unset the global coordinator, but cannot replace the global
coordinator with another one. Which is the behaviour we want.

[dimaa1, 2017/03/03 18:52:02]

Great idea!

+}
 
 void MemoryCoordinatorImpl::Start() {
   DCHECK(CalledOnValidThread());
   DCHECK(last_state_change_.is_null());
 
   notification_registrar_.Add(
       this, NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED,
       NotificationService::AllBrowserContextsAndSources());
   last_state_change_ = base::TimeTicks::Now();
   state_updater_->ScheduleUpdateState(base::TimeDelta());
@@ skipping 272 matching lines @@
 
 MemoryCoordinatorImpl::ChildInfo::ChildInfo() {}
 
 MemoryCoordinatorImpl::ChildInfo::ChildInfo(const ChildInfo& rhs) {
   // This is a nop, but exists for compatibility with STL containers.
 }
 
 MemoryCoordinatorImpl::ChildInfo::~ChildInfo() {}
 
 }  // namespace content