OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/browser_main_loop.h" | 5 #include "content/browser/browser_main_loop.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 1382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1393 void BrowserMainLoop::InitializeMemoryManagementComponent() { | 1393 void BrowserMainLoop::InitializeMemoryManagementComponent() { |
1394 if (base::FeatureList::IsEnabled(features::kMemoryCoordinator)) { | 1394 if (base::FeatureList::IsEnabled(features::kMemoryCoordinator)) { |
1395 // Disable MemoryPressureListener when memory coordinator is enabled. | 1395 // Disable MemoryPressureListener when memory coordinator is enabled. |
1396 base::MemoryPressureListener::SetNotificationsSuppressed(true); | 1396 base::MemoryPressureListener::SetNotificationsSuppressed(true); |
1397 // base::Unretained is safe because the lifetime of MemoryCoordinator is | 1397 // base::Unretained is safe because the lifetime of MemoryCoordinator is |
1398 // tied to the lifetime of the browser process. | 1398 // tied to the lifetime of the browser process. |
1399 base::MemoryCoordinatorProxy::GetInstance()-> | 1399 base::MemoryCoordinatorProxy::GetInstance()-> |
1400 SetGetCurrentMemoryStateCallback(base::Bind( | 1400 SetGetCurrentMemoryStateCallback(base::Bind( |
1401 &MemoryCoordinator::GetCurrentMemoryState, | 1401 &MemoryCoordinator::GetCurrentMemoryState, |
1402 base::Unretained(MemoryCoordinator::GetInstance()))); | 1402 base::Unretained(MemoryCoordinator::GetInstance()))); |
| 1403 base::MemoryCoordinatorProxy::GetInstance()-> |
| 1404 SetSetCurrentMemoryStateForTestingCallback(base::Bind( |
| 1405 &MemoryCoordinator::SetCurrentMemoryStateForTesting, |
| 1406 base::Unretained(MemoryCoordinator::GetInstance()))); |
1403 return; | 1407 return; |
1404 } | 1408 } |
1405 | 1409 |
1406 // TODO(chrisha): Abstract away this construction mess to a helper function, | 1410 // TODO(chrisha): Abstract away this construction mess to a helper function, |
1407 // once MemoryPressureMonitor is made a concrete class. | 1411 // once MemoryPressureMonitor is made a concrete class. |
1408 #if defined(OS_CHROMEOS) | 1412 #if defined(OS_CHROMEOS) |
1409 if (chromeos::switches::MemoryPressureHandlingEnabled()) { | 1413 if (chromeos::switches::MemoryPressureHandlingEnabled()) { |
1410 memory_pressure_monitor_.reset(new base::chromeos::MemoryPressureMonitor( | 1414 memory_pressure_monitor_.reset(new base::chromeos::MemoryPressureMonitor( |
1411 chromeos::switches::GetMemoryPressureThresholds())); | 1415 chromeos::switches::GetMemoryPressureThresholds())); |
1412 } | 1416 } |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1588 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = | 1592 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = |
1589 audio_thread_->task_runner(); | 1593 audio_thread_->task_runner(); |
1590 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), | 1594 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), |
1591 std::move(worker_task_runner), | 1595 std::move(worker_task_runner), |
1592 MediaInternals::GetInstance()); | 1596 MediaInternals::GetInstance()); |
1593 } | 1597 } |
1594 CHECK(audio_manager_); | 1598 CHECK(audio_manager_); |
1595 } | 1599 } |
1596 | 1600 |
1597 } // namespace content | 1601 } // namespace content |
OLD | NEW |