| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "base/message_loop/message_loop.h" | 5 #include "base/message_loop/message_loop.h" |
| 6 #include "extensions/browser/api/system_memory/memory_info_provider.h" | 6 #include "extensions/browser/api/system_memory/memory_info_provider.h" |
| 7 #include "extensions/shell/test/shell_apitest.h" | 7 #include "extensions/shell/test/shell_apitest.h" |
| 8 | 8 |
| 9 namespace extensions { | 9 namespace extensions { |
| 10 | 10 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 public: | 28 public: |
| 29 SystemMemoryApiTest() {} | 29 SystemMemoryApiTest() {} |
| 30 ~SystemMemoryApiTest() override {} | 30 ~SystemMemoryApiTest() override {} |
| 31 | 31 |
| 32 void SetUpInProcessBrowserTestFixture() override { | 32 void SetUpInProcessBrowserTestFixture() override { |
| 33 ShellApiTest::SetUpInProcessBrowserTestFixture(); | 33 ShellApiTest::SetUpInProcessBrowserTestFixture(); |
| 34 message_loop_.reset(new base::MessageLoopForUI); | 34 message_loop_.reset(new base::MessageLoopForUI); |
| 35 } | 35 } |
| 36 | 36 |
| 37 private: | 37 private: |
| 38 scoped_ptr<base::MessageLoop> message_loop_; | 38 std::unique_ptr<base::MessageLoop> message_loop_; |
| 39 }; | 39 }; |
| 40 | 40 |
| 41 IN_PROC_BROWSER_TEST_F(SystemMemoryApiTest, Memory) { | 41 IN_PROC_BROWSER_TEST_F(SystemMemoryApiTest, Memory) { |
| 42 scoped_refptr<MemoryInfoProvider> provider = new MockMemoryInfoProviderImpl(); | 42 scoped_refptr<MemoryInfoProvider> provider = new MockMemoryInfoProviderImpl(); |
| 43 // The provider is owned by the single MemoryInfoProvider instance. | 43 // The provider is owned by the single MemoryInfoProvider instance. |
| 44 MemoryInfoProvider::InitializeForTesting(provider); | 44 MemoryInfoProvider::InitializeForTesting(provider); |
| 45 ASSERT_TRUE(RunAppTest("system/memory")) << message_; | 45 ASSERT_TRUE(RunAppTest("system/memory")) << message_; |
| 46 } | 46 } |
| 47 | 47 |
| 48 } // namespace extensions | 48 } // namespace extensions |
| OLD | NEW |