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

Side by Side Diff: trunk/src/chrome/browser/extensions/api/system_info_memory/system_info_memory_apitest.cc

Issue 19492009: Revert 212538 "[SystemInfo API] Rename systemInfo Memory API." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/message_loop/message_loop.h" 6 #include "base/message_loop/message_loop.h"
7 #include "chrome/browser/extensions/api/system_info_memory/memory_info_provider. h" 7 #include "chrome/browser/extensions/api/system_info_memory/memory_info_provider. h"
8 #include "chrome/browser/extensions/extension_apitest.h" 8 #include "chrome/browser/extensions/extension_apitest.h"
9 #include "chrome/browser/extensions/extension_test_message_listener.h" 9 #include "chrome/browser/extensions/extension_test_message_listener.h"
10 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 }; 50 };
51 51
52 IN_PROC_BROWSER_TEST_F(SystemInfoMemoryApiTest, Memory) { 52 IN_PROC_BROWSER_TEST_F(SystemInfoMemoryApiTest, Memory) {
53 scoped_refptr<MemoryInfoProvider> provider = new MockMemoryInfoProviderImpl(); 53 scoped_refptr<MemoryInfoProvider> provider = new MockMemoryInfoProviderImpl();
54 // The provider is owned by the single MemoryInfoProvider instance. 54 // The provider is owned by the single MemoryInfoProvider instance.
55 MemoryInfoProvider::InitializeForTesting(provider); 55 MemoryInfoProvider::InitializeForTesting(provider);
56 ASSERT_TRUE(RunExtensionTest("systeminfo/memory")) << message_; 56 ASSERT_TRUE(RunExtensionTest("systeminfo/memory")) << message_;
57 } 57 }
58 58
59 } // namespace extensions 59 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698