Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1348)

Unified Diff: chrome/browser/memory/oom_priority_manager_browsertest_chromeos.cc

Issue 1188823002: [MemoryPressure] Move chrome/browser/chromeos/* to chrome/browser/memory/*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed sky@ comments. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/memory/oom_priority_manager_browsertest_chromeos.cc
diff --git a/chrome/browser/chromeos/memory/oom_priority_manager_browsertest.cc b/chrome/browser/memory/oom_priority_manager_browsertest_chromeos.cc
similarity index 94%
rename from chrome/browser/chromeos/memory/oom_priority_manager_browsertest.cc
rename to chrome/browser/memory/oom_priority_manager_browsertest_chromeos.cc
index d5458ee9839e1de1bec24eb0276ed2985fad982d..a6e8b24ed0b68a8071fe251507d6d07cf21e5c2a 100644
--- a/chrome/browser/chromeos/memory/oom_priority_manager_browsertest.cc
+++ b/chrome/browser/memory/oom_priority_manager_browsertest_chromeos.cc
@@ -6,7 +6,7 @@
#include "base/memory/memory_pressure_listener.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part_chromeos.h"
-#include "chrome/browser/chromeos/memory/oom_priority_manager.h"
+#include "chrome/browser/memory/oom_priority_manager.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/find_bar/find_bar_controller.h"
@@ -21,6 +21,7 @@
using content::OpenURLParams;
+namespace memory {
namespace {
typedef InProcessBrowserTest OomPriorityManagerTest;
@@ -28,7 +29,7 @@ typedef InProcessBrowserTest OomPriorityManagerTest;
IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPriorityManagerBasics) {
using content::WindowedNotificationObserver;
- chromeos::OomPriorityManager* oom_priority_manager =
+ OomPriorityManager* oom_priority_manager =
g_browser_process->platform_part()->oom_priority_manager();
EXPECT_FALSE(oom_priority_manager->recent_tab_discard());
@@ -45,8 +46,7 @@ IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPriorityManagerBasics) {
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
OpenURLParams open2(GURL(chrome::kChromeUICreditsURL), content::Referrer(),
- NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_TYPED,
- false);
+ NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_TYPED, false);
browser()->OpenURL(open2);
load2.Wait();
@@ -54,8 +54,7 @@ IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPriorityManagerBasics) {
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
OpenURLParams open3(GURL(chrome::kChromeUITermsURL), content::Referrer(),
- NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_TYPED,
- false);
+ NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_TYPED, false);
browser()->OpenURL(open3);
load3.Wait();
@@ -67,8 +66,7 @@ IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPriorityManagerBasics) {
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
OpenURLParams open4(GURL(chrome::kChromeUIVersionURL), content::Referrer(),
- CURRENT_TAB, ui::PAGE_TRANSITION_TYPED,
- false);
+ CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false);
browser()->OpenURL(open4);
load4.Wait();
@@ -76,9 +74,8 @@ IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPriorityManagerBasics) {
WindowedNotificationObserver load5(
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
- OpenURLParams open5(GURL("chrome://dns"), content::Referrer(),
- CURRENT_TAB, ui::PAGE_TRANSITION_TYPED,
- false);
+ OpenURLParams open5(GURL("chrome://dns"), content::Referrer(), CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false);
browser()->OpenURL(open5);
load5.Wait();
@@ -165,7 +162,7 @@ IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPriorityManagerBasics) {
// Test that the MemoryPressureListener event is properly triggering a tab
// discard upon |MEMORY_PRESSURE_LEVEL_CRITICAL| event.
IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPressureListener) {
- chromeos::OomPriorityManager* oom_priority_manager =
+ OomPriorityManager* oom_priority_manager =
g_browser_process->platform_part()->oom_priority_manager();
// Get three tabs open.
content::WindowedNotificationObserver load1(
@@ -180,8 +177,7 @@ IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPressureListener) {
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
OpenURLParams open2(GURL(chrome::kChromeUICreditsURL), content::Referrer(),
- NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_TYPED,
- false);
+ NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_TYPED, false);
browser()->OpenURL(open2);
load2.Wait();
EXPECT_FALSE(oom_priority_manager->recent_tab_discard());
@@ -209,3 +205,4 @@ IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPressureListener) {
}
} // namespace
+} // namespace memory
« no previous file with comments | « chrome/browser/memory/oom_priority_manager.h ('k') | chrome/browser/memory/oom_priority_manager_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698