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

Unified Diff: chrome/browser/extensions/api/system_info_memory/memory_info_provider_unittest.cc

Issue 18290002: [SystemInfo API] Finish TODOs in SystemInfoProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dev_rewrite_storage_info_api
Patch Set: Created 7 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/extensions/api/system_info_memory/memory_info_provider_unittest.cc
diff --git a/chrome/browser/extensions/api/system_info_memory/memory_info_provider_unittest.cc b/chrome/browser/extensions/api/system_info_memory/memory_info_provider_unittest.cc
index 9e008b37be4e99d02276a540e5a25fed72535e7a..43113c12683dee4e24c54acd650fcfc46dc43bc7 100644
--- a/chrome/browser/extensions/api/system_info_memory/memory_info_provider_unittest.cc
+++ b/chrome/browser/extensions/api/system_info_memory/memory_info_provider_unittest.cc
@@ -20,19 +20,24 @@ const struct TestMemoryInfo kTestingMemoryInfoData = { 4096.0, 1024.0 };
class TestMemoryInfoProvider : public MemoryInfoProvider {
public:
- virtual bool QueryInfo(MemoryInfo* info) OVERRIDE;
+ virtual void QueryInfo() OVERRIDE;
+ const MemoryInfo* memory_info() const;
+
private:
virtual ~TestMemoryInfoProvider();
};
TestMemoryInfoProvider::~TestMemoryInfoProvider() {}
-bool TestMemoryInfoProvider::QueryInfo(MemoryInfo* info) {
- if (info == NULL)
- return false;
+void TestMemoryInfoProvider::QueryInfo() {
+ MemoryInfo* info = &info_;
info->capacity = kTestingMemoryInfoData.capacity;
info->available_capacity = kTestingMemoryInfoData.available_capacity;
- return true;
+ success_ = true;
+}
+
+const MemoryInfo* TestMemoryInfoProvider::memory_info() const {
+ return &info_;
}
class MemoryInfoProviderTest : public testing::Test {
@@ -48,11 +53,11 @@ MemoryInfoProviderTest::MemoryInfoProviderTest()
}
TEST_F(MemoryInfoProviderTest, QueryMemoryInfo) {
- scoped_ptr<MemoryInfo> memory_info(new MemoryInfo());
- EXPECT_TRUE(memory_info_provider_->QueryInfo(memory_info.get()));
- EXPECT_DOUBLE_EQ(kTestingMemoryInfoData.capacity, memory_info->capacity);
+ memory_info_provider_->QueryInfo();
+ EXPECT_DOUBLE_EQ(kTestingMemoryInfoData.capacity,
+ memory_info_provider_->memory_info()->capacity);
EXPECT_DOUBLE_EQ(kTestingMemoryInfoData.available_capacity,
- memory_info->available_capacity);
+ memory_info_provider_->memory_info()->available_capacity);
}
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698