Remove linkable ephemeral apps

This includes the "enable-linkable-ephemeral-apps" switch as well as
the EphemeralAppThrottle.

BUG=324815, 312460
TBR=sky@chromium.org

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

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

chrome/app/generated_resources.grd

@@ -6660,12 +6660,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_ENABLE_EPHEMERAL_APPS_DESCRIPTION" desc="Description for the flag to enable ephemeral apps.">
         Enables experimentation with ephemeral apps, which are launched without installing in Chrome.
       </message>
-      <message name="IDS_FLAGS_ENABLE_LINKABLE_EPHEMERAL_APPS_NAME" desc="Name of the flag to enable linkable ephemeral apps.">
-        Enable experimental linkable ephemeral apps.
-      </message>
-      <message name="IDS_FLAGS_ENABLE_LINKABLE_EPHEMERAL_APPS_DESCRIPTION" desc="Description for the flag to enable linkable ephemeral apps.">
-        Enables experimentation with launching ephemeral apps from hyperlinks. For example, links to Chrome Web Store app detail pages in Google search results will launch the app rather than navigate to the detail page.
-      </message>
       <message name="IDS_FLAGS_ENABLE_SERVICE_WORKER_NAME" desc="Name of the flag to enable streamlined ServiceWorker.">
         Enable support for ServiceWorker.
       </message>

chrome/browser/about_flags.cc

@@ -1783,13 +1783,6 @@ const Experiment kExperiments[] = {
     kOsWin | kOsLinux | kOsCrOS,
     SINGLE_VALUE_TYPE(switches::kEnableEphemeralApps)
   },
-  {
-    "enable-linkable-ephemeral-apps",
-    IDS_FLAGS_ENABLE_LINKABLE_EPHEMERAL_APPS_NAME,
-    IDS_FLAGS_ENABLE_LINKABLE_EPHEMERAL_APPS_DESCRIPTION,
-    kOsWin | kOsLinux | kOsCrOS,
-    SINGLE_VALUE_TYPE(switches::kEnableLinkableEphemeralApps)
-  },
   {
     "enable-service-worker",
     IDS_FLAGS_ENABLE_SERVICE_WORKER_NAME,

chrome/browser/apps/ephemeral_app_throttle.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.
-
-#include "chrome/browser/apps/ephemeral_app_throttle.h"
-
-#include "base/command_line.h"
-#include "chrome/browser/apps/ephemeral_app_launcher.h"
-#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_io_data.h"
-#include "chrome/browser/ui/extensions/application_launch.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/common/extensions/extension_constants.h"
-#include "components/navigation_interception/intercept_navigation_resource_throttle.h"
-#include "components/navigation_interception/navigation_params.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/render_view_host.h"
-#include "content/public/browser/resource_throttle.h"
-#include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_view.h"
-#include "net/url_request/url_request.h"
-
-using content::BrowserThread;
-using content::WebContents;
-using extensions::Extension;
-
-namespace {
-
-bool LaunchEphemeralApp(
-    const std::string& app_id,
-    content::RenderViewHost* source,
-    const navigation_interception::NavigationParams& params) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  // Redirect top-level navigations only.
-  if (source->IsSubframe())
-    return false;
-
-  WebContents* web_contents = WebContents::FromRenderViewHost(source);
-  if (!web_contents)
-    return false;
-
-  Profile* profile =
-      Profile::FromBrowserContext(web_contents->GetBrowserContext());
-  if (!profile)
-    return false;
-
-  ExtensionService* service =
-      extensions::ExtensionSystem::Get(profile)->extension_service();
-  DCHECK(service);
-  const Extension* extension = service->GetExtensionById(app_id, false);
-
-  if (extension && extension->is_app()) {
-    // If the app is already installed, launch it.
-    AppLaunchParams params(profile, extension, NEW_FOREGROUND_TAB);
-    params.desktop_type = chrome::GetHostDesktopTypeForNativeView(
-        web_contents->GetView()->GetNativeView());
-    OpenApplication(params);
-    return true;
-  }
-
-  if (!extension) {
-    // Install ephemeral app and launch.
-    scoped_refptr<EphemeralAppLauncher> installer =
-        EphemeralAppLauncher::CreateForLink(app_id, web_contents);
-    installer->Start();
-    return true;
-  }
-
-  return false;
-}
-
-}  // namespace
-
-// static
-content::ResourceThrottle*
-EphemeralAppThrottle::MaybeCreateThrottleForLaunch(
-    net::URLRequest* request,
-    ProfileIOData* profile_io_data) {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableLinkableEphemeralApps))
-    return NULL;
-
-  if (request->method() != "GET" || !request->url().SchemeIsHTTPOrHTTPS())
-    return NULL;
-
-  // Not supported for incognito profiles.
-  if (profile_io_data->is_incognito())
-    return NULL;
-
-  // Only watch for links in Google search results.
-  if (request->referrer().find("http://www.google.com") == std::string::npos &&
-      request->referrer().find("https://www.google.com") == std::string::npos)
-    return NULL;
-
-  // Crudely watch for links to Chrome Web Store detail pages and assume that
-  // the app ID will be after the last slash of the URL. We cannot even
-  // differentiate between apps and extensions, so attempt to launch both.
-  // This is obviously for experimental purposes only and will be implemented
-  // properly in production code - for example, links to ephemeral apps could
-  // have a new scheme.
-  if (request->url().spec().find(
-          extension_urls::GetWebstoreItemDetailURLPrefix()) != 0)
-    return NULL;
-
-  std::string app_id(request->url().ExtractFileName());
-  if (!Extension::IdIsValid(app_id))
-    return NULL;
-
-  return new navigation_interception::InterceptNavigationResourceThrottle(
-      request,
-      base::Bind(&LaunchEphemeralApp, app_id));
-}

chrome/browser/apps/ephemeral_app_throttle.h

-// 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.
-
-#ifndef CHROME_BROWSER_APPS_EPHEMERAL_APP_THROTTLE_H_
-#define CHROME_BROWSER_APPS_EPHEMERAL_APP_THROTTLE_H_
-
-#include "base/basictypes.h"
-
-namespace content {
-class ResourceThrottle;
-}
-
-namespace net {
-class URLRequest;
-}
-
-class ProfileIOData;
-
-// This class creates resource throttles that will launch ephemeral apps for
-// links to Chrome Web Store detail pages instead of opening the page in the
-// browser. This will only occur if the enable-ephemeral-apps switch is enabled.
-class EphemeralAppThrottle {
- public:
-  static content::ResourceThrottle* MaybeCreateThrottleForLaunch(
-      net::URLRequest* request,
-      ProfileIOData* profile_io_data);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(EphemeralAppThrottle);
-};
-
-#endif  // CHROME_BROWSER_APPS_EPHEMERAL_APP_THROTTLE_H_

chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

@@ -71,7 +71,6 @@
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #else
 #include "chrome/browser/apps/app_url_redirector.h"
-#include "chrome/browser/apps/ephemeral_app_throttle.h"
 #endif
 
 #if defined(OS_CHROMEOS)
@@ -251,13 +250,6 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning(
         AppUrlRedirector::MaybeCreateThrottleFor(request, io_data);
     if (url_to_app_throttle)
       throttles->push_back(url_to_app_throttle);
-
-    // Experimental: Launch ephemeral apps from search results.
-    content::ResourceThrottle* ephemeral_app_throttle =
-        EphemeralAppThrottle::MaybeCreateThrottleForLaunch(
-            request, io_data);
-    if (ephemeral_app_throttle)
-      throttles->push_back(ephemeral_app_throttle);
 #endif
   }
 

chrome/chrome_browser_extensions.gypi

@@ -69,8 +69,6 @@
         'browser/apps/chrome_apps_client.h',
         'browser/apps/ephemeral_app_launcher.cc',
         'browser/apps/ephemeral_app_launcher.h',
-        'browser/apps/ephemeral_app_throttle.cc',
-        'browser/apps/ephemeral_app_throttle.h',
         'browser/apps/shortcut_manager.cc',
         'browser/apps/shortcut_manager.h',
         'browser/apps/shortcut_manager_factory.cc',

chrome/common/chrome_switches.cc

@@ -640,9 +640,6 @@ const char kEnableIPv6[]                    = "enable-ipv6";
 // attempt to use the existing connection.
 const char kEnableIPPooling[]               = "enable-ip-pooling";
 
-// Enables experimentation with launching ephemeral apps via hyperlinks.
-const char kEnableLinkableEphemeralApps[]   = "enable-linkable-ephemeral-apps";
-
 // Enable always using the local NTP for the first NTP load of a new window.
 const char kEnableLocalFirstLoadNTP[] = "enable-local-first-load-ntp";
 

chrome/common/chrome_switches.h

@@ -182,7 +182,6 @@ extern const char kEnableHttp2Draft04[];
 extern const char kEnableInlineSignin[];
 extern const char kEnableIPPooling[];
 extern const char kEnableIPv6[];
-extern const char kEnableLinkableEphemeralApps[];
 extern const char kEnableLocalFirstLoadNTP[];
 extern const char kEnableManagedStorage[];
 extern const char kEnableManagedUsers[];