3 files changed, 12 insertions, 67 deletions
diff --git a/chromium/base/memory/fake_memory_pressure_monitor.cc b/chromium/base/memory/fake_memory_pressure_monitor.cc
deleted file mode 100644
index 59fd3ef66eb..00000000000
--- a/chromium/base/memory/fake_memory_pressure_monitor.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2018 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 "base/memory/fake_memory_pressure_monitor.h"
-
-namespace base {
-namespace test {
-
-FakeMemoryPressureMonitor::FakeMemoryPressureMonitor()
-    : MemoryPressureMonitor(),
-      memory_pressure_level_(MemoryPressureLevel::MEMORY_PRESSURE_LEVEL_NONE) {}
-
-FakeMemoryPressureMonitor::~FakeMemoryPressureMonitor() {}
-
-void FakeMemoryPressureMonitor::SetAndNotifyMemoryPressure(
-    MemoryPressureLevel level) {
-  memory_pressure_level_ = level;
-  base::MemoryPressureListener::SimulatePressureNotification(level);
-}
-
-base::MemoryPressureMonitor::MemoryPressureLevel
-FakeMemoryPressureMonitor::GetCurrentPressureLevel() const {
-  return memory_pressure_level_;
-}
-
-void FakeMemoryPressureMonitor::SetDispatchCallback(
-    const DispatchCallback& callback) {
-  LOG(ERROR) << "FakeMemoryPressureMonitor::SetDispatchCallback";
-}
-
-}  // namespace test
-}  // namespace base
diff --git a/chromium/base/memory/fake_memory_pressure_monitor.h b/chromium/base/memory/fake_memory_pressure_monitor.h
deleted file mode 100644
index d012876d54e..00000000000
--- a/chromium/base/memory/fake_memory_pressure_monitor.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2018 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.
-
-#ifndef BASE_MEMORY_FAKE_MEMORY_PRESSURE_MONITOR_H_
-#define BASE_MEMORY_FAKE_MEMORY_PRESSURE_MONITOR_H_
-
-#include "base/macros.h"
-#include "base/memory/memory_pressure_monitor.h"
-
-namespace base {
-namespace test {
-
-class FakeMemoryPressureMonitor : public base::MemoryPressureMonitor {
- public:
-  FakeMemoryPressureMonitor();
-  ~FakeMemoryPressureMonitor() override;
-
-  void SetAndNotifyMemoryPressure(MemoryPressureLevel level);
-
-  // base::MemoryPressureMonitor overrides:
-  MemoryPressureLevel GetCurrentPressureLevel() const override;
-  void SetDispatchCallback(const DispatchCallback& callback) override;
-
- private:
-  MemoryPressureLevel memory_pressure_level_;
-
-  DISALLOW_COPY_AND_ASSIGN(FakeMemoryPressureMonitor);
-};
-
-}  // namespace test
-}  // namespace base
-
-#endif  // BASE_MEMORY_FAKE_MEMORY_PRESSURE_MONITOR_H_
diff --git a/chromium/base/memory/scoped_refptr.h b/chromium/base/memory/scoped_refptr.h
index 23dec28c4a4..ee8b75b3f88 100644
--- a/chromium/base/memory/scoped_refptr.h
+++ b/chromium/base/memory/scoped_refptr.h
@@ -25,10 +25,17 @@ class RefCounted;
 template <class, typename>
 class RefCountedThreadSafe;
 class SequencedTaskRunner;
+class WrappedPromise;
 
 template <typename T>
 scoped_refptr<T> AdoptRef(T* t);
 
+namespace internal {
+
+class BasePromise;
+
+}  // namespace internal
+
 namespace subtle {
 
 enum AdoptRefTag { kAdoptRefTag };
@@ -260,6 +267,11 @@ class scoped_refptr {
   friend scoped_refptr<U> base::AdoptRef(U*);
   friend class ::base::SequencedTaskRunner;
 
+  // Friend access so these classes can use the constructor below as part of a
+  // binary size optimization.
+  friend class ::base::internal::BasePromise;
+  friend class ::base::WrappedPromise;
+
   // Returns the owned pointer (if any), releasing ownership to the caller. The
   // caller is responsible for managing the lifetime of the reference.
   T* release();