PlatformAppApiTest class should not enable experimental APIs by default

Now that some of our APIs are out of experimental, the ones still in
experimental should append the command line individually in their tests as
needed.

BUG=155430


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

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

7 files changed, 33 insertions, 31 deletions

diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc
index 696f617..8f7bcb8 100644
--- a/chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc
+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc
@@ -14,9 +14,10 @@
 #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/ui_test_utils.h"
 #include "chromeos/dbus/bluetooth_out_of_band_client.h"
 #include "chromeos/dbus/bluetooth_out_of_band_pairing_data.h"
-#include "chrome/test/base/ui_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using extensions::Extension;
@@ -29,10 +30,15 @@ namespace {
 static const char* kAdapterAddress = "A1:A2:A3:A4:A5:A6";
 static const char* kName = "whatsinaname";
 
-class BluetoothApiTest : public PlatformAppApiTest {
+class BluetoothApiTest : public ExtensionApiTest {
  public:
   BluetoothApiTest() : empty_extension_(utils::CreateEmptyExtension()) {}
 
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    ExtensionApiTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
+  }
+
   virtual void SetUpOnMainThread() OVERRIDE {
     // The browser will clean this up when it is torn down
     mock_adapter_ = new testing::StrictMock<chromeos::MockBluetoothAdapter>(
diff --git a/chrome/browser/extensions/api/dns/dns_apitest.cc b/chrome/browser/extensions/api/dns/dns_apitest.cc
index e215a64..a4c5ad0 100644
--- a/chrome/browser/extensions/api/dns/dns_apitest.cc
+++ b/chrome/browser/extensions/api/dns/dns_apitest.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/extensions/api/dns/mock_host_resolver_creator.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
+#include "chrome/common/chrome_switches.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
@@ -18,12 +19,17 @@ using extension_function_test_utils::RunFunctionAndReturnSingleResult;
 
 namespace {
 
-class DnsApiTest : public PlatformAppApiTest {
+class DnsApiTest : public ExtensionApiTest {
  public:
   DnsApiTest() : resolver_event_(true, false),
                  resolver_creator_(new extensions::MockHostResolverCreator()) {
   }
 
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    ExtensionApiTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
+  }
+
   void SetUpOnMainThread() OVERRIDE {
     extensions::HostResolverWrapper::GetInstance()->SetHostResolverForTesting(
         resolver_creator_->CreateMockHostResolver());
diff --git a/chrome/browser/extensions/api/notification/notification_apitest.cc b/chrome/browser/extensions/api/notification/notification_apitest.cc
index f5b4c05..d32f51c 100644
--- a/chrome/browser/extensions/api/notification/notification_apitest.cc
+++ b/chrome/browser/extensions/api/notification/notification_apitest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/extensions/api/notification/notification_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
+#include "chrome/common/chrome_switches.h"
 
 using extensions::Extension;
 
@@ -12,7 +13,12 @@ namespace utils = extension_function_test_utils;
 
 namespace {
 
-class NotificationApiTest : public PlatformAppApiTest {
+class NotificationApiTest : public ExtensionApiTest {
+ public:
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    ExtensionApiTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
+  }
 };
 
 }  // namespace
diff --git a/chrome/browser/extensions/api/serial/serial_apitest.cc b/chrome/browser/extensions/api/serial/serial_apitest.cc
index 44ff9bc..6495184 100644
--- a/chrome/browser/extensions/api/serial/serial_apitest.cc
+++ b/chrome/browser/extensions/api/serial/serial_apitest.cc
@@ -24,7 +24,7 @@ using content::BrowserThread;
 
 namespace {
 
-class SerialApiTest : public PlatformAppApiTest {
+class SerialApiTest : public ExtensionApiTest {
  public:
   SerialApiTest() {}
 };
diff --git a/chrome/browser/extensions/api/socket/socket_apitest.cc b/chrome/browser/extensions/api/socket/socket_apitest.cc
index 2124eb3..59268bb 100644
--- a/chrome/browser/extensions/api/socket/socket_apitest.cc
+++ b/chrome/browser/extensions/api/socket/socket_apitest.cc
@@ -12,6 +12,7 @@
 #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/base/mock_host_resolver.h"
@@ -26,13 +27,21 @@ namespace {
 const std::string kHostname = "127.0.0.1";
 const int kPort = 8888;
 
-class SocketApiTest : public PlatformAppApiTest {
+class SocketApiTest : public ExtensionApiTest {
  public:
   SocketApiTest() : resolver_event_(true, false),
                     resolver_creator_(
                         new extensions::MockHostResolverCreator()) {
   }
 
+  // We need this while the socket.{listen,accept} methods require the
+  // enable-experimental-extension-apis flag. After that we should remove it,
+  // as well as the "experimental" permission in the test apps' manifests.
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    ExtensionApiTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
+  }
+
   void SetUpOnMainThread() OVERRIDE {
     extensions::HostResolverWrapper::GetInstance()->SetHostResolverForTesting(
         resolver_creator_->CreateMockHostResolver());
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index 1a2b50d..f70b3b1 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_registrar.h"
@@ -312,17 +311,3 @@ void ExtensionApiTest::SetUpCommandLine(CommandLine* command_line) {
   ExtensionBrowserTest::SetUpCommandLine(command_line);
   test_data_dir_ = test_data_dir_.AppendASCII("api_test");
 }
-
-PlatformAppApiTest::PlatformAppApiTest() {}
-
-PlatformAppApiTest::~PlatformAppApiTest() {}
-
-void PlatformAppApiTest::SetUpCommandLine(CommandLine* command_line) {
-  ExtensionApiTest::SetUpCommandLine(command_line);
-
-  // If someone is using this class, we're going to insist on management of the
-  // relevant flags. If these flags are already set, die.
-  DCHECK(!command_line->HasSwitch(switches::kEnableExperimentalExtensionApis));
-
-  command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
-}
diff --git a/chrome/browser/extensions/extension_apitest.h b/chrome/browser/extensions/extension_apitest.h
index de7abb9..143f9fd 100644
--- a/chrome/browser/extensions/extension_apitest.h
+++ b/chrome/browser/extensions/extension_apitest.h
@@ -183,14 +183,4 @@ class ExtensionApiTest : public ExtensionBrowserTest {
   scoped_ptr<net::TestServer> websocket_server_;
 };
 
-// PlatformAppApiTest sets up the command-line flags necessary for platform
-// apps (if any).
-class PlatformAppApiTest : public ExtensionApiTest {
- public:
-  PlatformAppApiTest();
-  virtual ~PlatformAppApiTest();
-
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
-};
-
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_APITEST_H_