Revert of Restrict use of two app-launching command line flags

apps/load_and_launch_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Tests for the --load-and-launch-app switch.
 // The two cases are when chrome is running and another process uses the switch
 // and when chrome is started from scratch.
 
 #include "apps/switches.h"
 #include "base/process/launch.h"
-#include "base/strings/utf_string_conversions.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
-#include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/simple_message_box_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/test_launcher.h"
-#include "extensions/browser/extension_registry.h"
 #include "extensions/test/extension_test_message_listener.h"
 
 using extensions::PlatformAppBrowserTest;
 
 namespace apps {
 
 namespace {
 
 const char* kSwitchesToCopy[] = {
     switches::kUserDataDir,
     switches::kNoSandbox,
 };
 
-static const std::string kTestExtensionId("behllobkkfkfnphdnhnkndlbkcpglgmj");
-
 }  // namespace
 
 // TODO(jackhou): Enable this test once it works on OSX. It currently does not
 // work for the same reason --app-id doesn't. See http://crbug.com/148465
 #if defined(OS_MACOSX)
 #define MAYBE_LoadAndLaunchAppChromeRunning \
         DISABLED_LoadAndLaunchAppChromeRunning
 #else
 #define MAYBE_LoadAndLaunchAppChromeRunning LoadAndLaunchAppChromeRunning
 #endif
@@ skipping 64 matching lines @@
 
   ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
   int exit_code;
   ASSERT_TRUE(process.WaitForExitWithTimeout(TestTimeouts::action_timeout(),
                                              &exit_code));
   ASSERT_EQ(0, exit_code);
 }
 
 namespace {
 
-// TestFixture that appends --load-and-launch-app with an app before calling
-// BrowserMain.
-class LoadAndLaunchPlatformAppBrowserTest : public PlatformAppBrowserTest {
+// TestFixture that appends --load-and-launch-app before calling BrowserMain.
+class PlatformAppLoadAndLaunchBrowserTest : public PlatformAppBrowserTest {
  protected:
-  LoadAndLaunchPlatformAppBrowserTest() {}
+  PlatformAppLoadAndLaunchBrowserTest() {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     PlatformAppBrowserTest::SetUpCommandLine(command_line);
-    base::FilePath app_path =
-        test_data_dir_.AppendASCII("platform_apps").AppendASCII("minimal");
-    command_line->AppendSwitchNative(apps::kLoadAndLaunchApp, app_path.value());
+    app_path_ = test_data_dir_
+        .AppendASCII("platform_apps")
+        .AppendASCII("minimal");
+    command_line->AppendSwitchNative(apps::kLoadAndLaunchApp,
+                                     app_path_.value());
   }
 
   void LoadAndLaunchApp() {
     ExtensionTestMessageListener launched_listener("Launched", false);
     ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
 
     // Start an actual browser because we can't shut down with just an app
     // window.
     CreateBrowser(ProfileManager::GetActiveUserProfile());
   }
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(LoadAndLaunchPlatformAppBrowserTest);
-};
+  base::FilePath app_path_;
 
-// TestFixture that appends --load-and-launch-app with an extension before
-// calling BrowserMain.
-class LoadAndLaunchExtensionBrowserTest : public PlatformAppBrowserTest {
- protected:
-  LoadAndLaunchExtensionBrowserTest() {}
-
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    PlatformAppBrowserTest::SetUpCommandLine(command_line);
-    base::FilePath app_path = test_data_dir_.AppendASCII("good")
-                                  .AppendASCII("Extensions")
-                                  .AppendASCII(kTestExtensionId)
-                                  .AppendASCII("1.0.0.0");
-    command_line->AppendSwitchNative(apps::kLoadAndLaunchApp, app_path.value());
-  }
-
-  void SetUpInProcessBrowserTestFixture() override {
-    PlatformAppBrowserTest::SetUpInProcessBrowserTestFixture();
-
-    // Skip showing the error message box to avoid freezing the main thread.
-    chrome::internal::g_should_skip_message_box_for_test = true;
-  }
-
-  DISALLOW_COPY_AND_ASSIGN(LoadAndLaunchExtensionBrowserTest);
+  DISALLOW_COPY_AND_ASSIGN(PlatformAppLoadAndLaunchBrowserTest);
 };
 
 }  // namespace
 
 
 // TODO(jackhou): Make this test not flaky on Vista or Linux Aura. See
 // http://crbug.com/176897
 #if defined(OS_WIN) || (defined(OS_LINUX) && defined(USE_AURA))
 #define MAYBE_LoadAndLaunchAppChromeNotRunning \
         DISABLED_LoadAndLaunchAppChromeNotRunning
 #else
 #define MAYBE_LoadAndLaunchAppChromeNotRunning \
         LoadAndLaunchAppChromeNotRunning
 #endif
 
 // Case where Chrome is not running.
-IN_PROC_BROWSER_TEST_F(LoadAndLaunchPlatformAppBrowserTest,
+IN_PROC_BROWSER_TEST_F(PlatformAppLoadAndLaunchBrowserTest,
                        MAYBE_LoadAndLaunchAppChromeNotRunning) {
   LoadAndLaunchApp();
 }
 
-IN_PROC_BROWSER_TEST_F(LoadAndLaunchExtensionBrowserTest,
-                       LoadAndLaunchExtension) {
-  const std::vector<base::string16>* errors =
-      ExtensionErrorReporter::GetInstance()->GetErrors();
-
-#if defined(GOOGLE_CHROME_BUILD)
-  // The error is skipped on official builds.
-  EXPECT_TRUE(errors->empty());
-#else
-  // Expect kUnpackedExtensionInsteadOfAppError.
-  EXPECT_EQ(1u, errors->size());
-  EXPECT_NE(base::string16::npos,
-            errors->at(0).find(base::ASCIIToUTF16(
-                "App loading flags cannot be used to load extensions")));
-#endif
-
-  extensions::ExtensionRegistry* registry =
-      extensions::ExtensionRegistry::Get(profile());
-  EXPECT_EQ(nullptr,
-            registry->GetExtensionById(
-                kTestExtensionId, extensions::ExtensionRegistry::EVERYTHING));
-}
-
 }  // namespace apps