Expand usage of platform-apps flag and permission features.

Reapplication of http://codereview.chromium.org/9834022/ with the
VerifyPermissions test #ifdefed out for Windows.

BUG=119758
TEST=added

Review URL: https://chromiumcodereview.appspot.com/9837045

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128610 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 9 deletions

diff --git a/chrome/browser/extensions/api/socket/socket_apitest.cc b/chrome/browser/extensions/api/socket/socket_apitest.cc
index 7d8ec3d..d105325 100644
--- a/chrome/browser/extensions/api/socket/socket_apitest.cc
+++ b/chrome/browser/extensions/api/socket/socket_apitest.cc
@@ -2,15 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/api/socket/socket_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "net/test/test_server.h"
@@ -22,14 +21,8 @@ namespace {
 const std::string kHostname = "127.0.0.1";
 const int kPort = 8888;
 
-class SocketApiTest : public ExtensionApiTest {
+class SocketApiTest : public PlatformAppApiTest {
  public:
-  virtual void SetUpCommandLine(CommandLine* command_line) {
-    ExtensionApiTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
-    command_line->AppendSwitch(switches::kEnablePlatformApps);
-  }
-
   static std::string GenerateCreateFunctionArgs(const std::string& protocol,
                                                 const std::string& address,
                                                 int port) {
@@ -38,6 +31,10 @@ class SocketApiTest : public ExtensionApiTest {
   }
 };
 
+}  // namespace
+
+IN_PROC_BROWSER_TEST_F(SocketApiTest, VerifyPermissions) {
+  VerifyPermissions(test_data_dir_.AppendASCII("socket/api"));
 }
 
 IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketUDPCreateGood) {