| Index: chrome/browser/browser_process_platform_part_chromeos.h
|
| diff --git a/chrome/browser/browser_process_platform_part_chromeos.h b/chrome/browser/browser_process_platform_part_chromeos.h
|
| index 6012af98c7321305d642e27ce6bd475032bdc3dd..d764ec2e1240b61dc52cfc667b5d3f3e3414c310 100644
|
| --- a/chrome/browser/browser_process_platform_part_chromeos.h
|
| +++ b/chrome/browser/browser_process_platform_part_chromeos.h
|
| @@ -16,7 +16,6 @@ class CommandLine;
|
|
|
| namespace chromeos {
|
| class ChromeUserManager;
|
| -class OomPriorityManager;
|
| class ProfileHelper;
|
| class TimeZoneResolver;
|
| }
|
| @@ -29,6 +28,10 @@ class DeviceDisablingManagerDefaultDelegate;
|
| }
|
| }
|
|
|
| +namespace memory {
|
| +class OomPriorityManager;
|
| +}
|
| +
|
| namespace policy {
|
| class BrowserPolicyConnector;
|
| class BrowserPolicyConnectorChromeOS;
|
| @@ -71,7 +74,7 @@ class BrowserProcessPlatformPart : public BrowserProcessPlatformPartBase,
|
|
|
| // Returns the out-of-memory priority manager.
|
| // Virtual for testing (see TestingBrowserProcessPlatformPart).
|
| - virtual chromeos::OomPriorityManager* oom_priority_manager();
|
| + virtual memory::OomPriorityManager* oom_priority_manager();
|
|
|
| // Returns the ProfileHelper instance that is used to identify
|
| // users and their profiles in Chrome OS multi user session.
|
| @@ -107,7 +110,7 @@ class BrowserProcessPlatformPart : public BrowserProcessPlatformPartBase,
|
| bool created_profile_helper_;
|
| scoped_ptr<chromeos::ProfileHelper> profile_helper_;
|
|
|
| - scoped_ptr<chromeos::OomPriorityManager> oom_priority_manager_;
|
| + scoped_ptr<memory::OomPriorityManager> oom_priority_manager_;
|
|
|
| scoped_ptr<chromeos::system::AutomaticRebootManager>
|
| automatic_reboot_manager_;
|
|
|