| Index: chrome/browser/extensions/api/system_memory/memory_info_provider.h
|
| diff --git a/chrome/browser/extensions/api/system_info_memory/memory_info_provider.h b/chrome/browser/extensions/api/system_memory/memory_info_provider.h
|
| similarity index 55%
|
| rename from chrome/browser/extensions/api/system_info_memory/memory_info_provider.h
|
| rename to chrome/browser/extensions/api/system_memory/memory_info_provider.h
|
| index d9200364c707982fd639f8213e788aabc31fb3b6..f464afa597b1f54f0094320149aeccab7713daa6 100644
|
| --- a/chrome/browser/extensions/api/system_info_memory/memory_info_provider.h
|
| +++ b/chrome/browser/extensions/api/system_memory/memory_info_provider.h
|
| @@ -2,28 +2,26 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INFO_MEMORY_MEMORY_INFO_PROVIDER_H_
|
| -#define CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INFO_MEMORY_MEMORY_INFO_PROVIDER_H_
|
| +#ifndef CHROME_BROWSER_EXTENSIONS_API_SYSTEM_MEMORY_MEMORY_INFO_PROVIDER_H_
|
| +#define CHROME_BROWSER_EXTENSIONS_API_SYSTEM_MEMORY_MEMORY_INFO_PROVIDER_H_
|
|
|
| #include "chrome/browser/extensions/api/system_info/system_info_provider.h"
|
| -#include "chrome/common/extensions/api/system_info_memory.h"
|
| +#include "chrome/common/extensions/api/system_memory.h"
|
|
|
| namespace extensions {
|
|
|
| class MemoryInfoProvider
|
| - : public SystemInfoProvider<
|
| - api::system_info_memory::MemoryInfo> {
|
| + : public SystemInfoProvider<api::system_memory::MemoryInfo> {
|
| public:
|
| static MemoryInfoProvider* Get();
|
|
|
| // Overriden from SystemInfoProvider<MemoryInfo>.
|
| virtual bool QueryInfo() OVERRIDE;
|
|
|
| - const api::system_info_memory::MemoryInfo& memory_info() const;
|
| + const api::system_memory::MemoryInfo& memory_info() const;
|
|
|
| private:
|
| - friend class SystemInfoProvider<
|
| - api::system_info_memory::MemoryInfo>;
|
| + friend class SystemInfoProvider<api::system_memory::MemoryInfo>;
|
| friend class MockMemoryInfoProviderImpl;
|
| friend class TestMemoryInfoProvider;
|
|
|
| @@ -35,5 +33,5 @@ class MemoryInfoProvider
|
|
|
| } // namespace extensions
|
|
|
| -#endif // CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INFO_MEMORY_MEMORY_INFO_PROVIDER_H_
|
| +#endif // CHROME_BROWSER_EXTENSIONS_API_SYSTEM_MEMORY_MEMORY_INFO_PROVIDER_H_
|
|
|
|
|