Move system.memory API test to extensions/

BUG=392842

Review URL: https://codereview.chromium.org/706003003

Cr-Commit-Position: refs/heads/master@{#303392}

5 files changed, 7 insertions, 6 deletions

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 9129e5a..947f8bd 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -328,7 +328,6 @@
       'browser/extensions/api/system_indicator/system_indicator_apitest.cc',
       'browser/extensions/api/system_cpu/system_cpu_apitest.cc',
       'browser/extensions/api/system_display/system_display_apitest.cc',
-      'browser/extensions/api/system_memory/system_memory_apitest.cc',
       'browser/extensions/api/system_network/system_network_apitest.cc',
       'browser/extensions/api/system_private/system_private_apitest.cc',
       'browser/extensions/api/system_storage/storage_api_test_util.cc',
diff --git a/chrome/browser/extensions/api/system_memory/system_memory_apitest.cc b/extensions/browser/api/system_memory/system_memory_apitest.cc
index a3ca7f9..40c1cfc 100644
--- a/chrome/browser/extensions/api/system_memory/system_memory_apitest.cc
+++ b/extensions/browser/api/system_memory/system_memory_apitest.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/message_loop/message_loop.h"
-#include "chrome/browser/extensions/extension_apitest.h"
 #include "extensions/browser/api/system_memory/memory_info_provider.h"
+#include "extensions/shell/test/shell_apitest.h"
 
 namespace extensions {
 
@@ -19,17 +19,18 @@ class MockMemoryInfoProviderImpl : public MemoryInfoProvider {
     info_.available_capacity = 1024;
     return true;
   }
+
  private:
   ~MockMemoryInfoProviderImpl() override {}
 };
 
-class SystemMemoryApiTest: public ExtensionApiTest {
+class SystemMemoryApiTest : public ShellApiTest {
  public:
   SystemMemoryApiTest() {}
   ~SystemMemoryApiTest() override {}
 
   void SetUpInProcessBrowserTestFixture() override {
-    ExtensionApiTest::SetUpInProcessBrowserTestFixture();
+    ShellApiTest::SetUpInProcessBrowserTestFixture();
     message_loop_.reset(new base::MessageLoopForUI);
   }
 
@@ -41,7 +42,7 @@ IN_PROC_BROWSER_TEST_F(SystemMemoryApiTest, Memory) {
   scoped_refptr<MemoryInfoProvider> provider = new MockMemoryInfoProviderImpl();
   // The provider is owned by the single MemoryInfoProvider instance.
   MemoryInfoProvider::InitializeForTesting(provider);
-  ASSERT_TRUE(RunExtensionTest("system/memory")) << message_;
+  ASSERT_TRUE(RunAppTest("system/memory")) << message_;
 }
 
 }  // namespace extensions
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp
index 2682d5e..6e1ee75 100644
--- a/extensions/shell/app_shell.gyp
+++ b/extensions/shell/app_shell.gyp
@@ -209,6 +209,7 @@
         '../browser/api/socket/socket_apitest.cc',
         '../browser/api/sockets_tcp/sockets_tcp_apitest.cc',
         '../browser/api/sockets_udp/sockets_udp_apitest.cc',
+        '../browser/api/system_memory/system_memory_apitest.cc',
         '../browser/api/usb/usb_apitest.cc',
         '../browser/guest_view/app_view/app_view_apitest.cc',
         '../browser/guest_view/web_view/web_view_apitest.h',
diff --git a/chrome/test/data/extensions/api_test/system/memory/manifest.json b/extensions/test/data/system/memory/manifest.json
index 50936bd..50936bd 100644
--- a/chrome/test/data/extensions/api_test/system/memory/manifest.json
+++ b/extensions/test/data/system/memory/manifest.json
diff --git a/chrome/test/data/extensions/api_test/system/memory/test_memory_api.js b/extensions/test/data/system/memory/test_memory_api.js
index 1dce043..c828bede 100644
--- a/chrome/test/data/extensions/api_test/system/memory/test_memory_api.js
+++ b/extensions/test/data/system/memory/test_memory_api.js
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 // system.memory api test
-// browser_tests --gtest_filter=SystemMemoryApiTest.*
+// app_shell_browsertests --gtest_filter=SystemMemoryApiTest.*
 
 chrome.test.runTests([
   function testGet() {