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, 5 insertions, 9 deletions

diff --git a/chrome/browser/extensions/api/serial/serial_apitest.cc b/chrome/browser/extensions/api/serial/serial_apitest.cc
index e146cc9..1d71ab6 100644
--- a/chrome/browser/extensions/api/serial/serial_apitest.cc
+++ b/chrome/browser/extensions/api/serial/serial_apitest.cc
@@ -2,33 +2,29 @@
 // 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/scoped_ptr.h"
 #include "chrome/browser/extensions/api/serial/serial_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace {
 
-class SerialApiTest : public ExtensionApiTest {
+class SerialApiTest : public PlatformAppApiTest {
  public:
   SerialApiTest() {}
-
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    ExtensionApiTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
-    command_line->AppendSwitch(switches::kEnablePlatformApps);
-  }
 };
 
 }  // namespace
 
+IN_PROC_BROWSER_TEST_F(SerialApiTest, VerifyPermissions) {
+  VerifyPermissions(test_data_dir_.AppendASCII("serial/api"));
+}
+
 IN_PROC_BROWSER_TEST_F(SerialApiTest, SerialExtension) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());