Shape Detection: Remove ConstructorCallWith=Document

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 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/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 183 matching lines @@
 #include "net/cookies/cookie_options.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "ppapi/features/features.h"
 #include "ppapi/host/ppapi_host.h"
 #include "printing/features/features.h"
 #include "services/image_decoder/public/interfaces/constants.mojom.h"
 #include "services/preferences/public/interfaces/preferences.mojom.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 #include "services/service_manager/public/cpp/service.h"
-#include "services/shape_detection/public/interfaces/barcodedetection.mojom.h"
-#include "services/shape_detection/public/interfaces/textdetection.mojom.h"
 #include "storage/browser/fileapi/external_mount_points.h"
 #include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
 #if defined(OS_WIN)
 #include "base/strings/string_tokenizer.h"
@@ skipping 1222 matching lines @@
       switches::kEnableOfflineAutoReloadVisibleOnly)) {
     return true;
   }
   if (browser_command_line.HasSwitch(
       switches::kDisableOfflineAutoReloadVisibleOnly)) {
     return false;
   }
   return true;
 }
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \
-    defined(OS_ANDROID)

[mcasas, 2017/01/18 02:05:10]

nit: is this your changes or a side effect of some
rebase?

[xianglu, 2017/01/18 02:22:30]

I removed this because otherwise AreExperimentalWebPlatformFeaturesEnabled()
will become an unused method when it's compiled on Android.

+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
 bool AreExperimentalWebPlatformFeaturesEnabled() {
   const base::CommandLine& browser_command_line =
       *base::CommandLine::ForCurrentProcess();
   return browser_command_line.HasSwitch(
       switches::kEnableExperimentalWebPlatformFeatures);
 }
 #endif
 
 void MaybeAppendBlinkSettingsSwitchForFieldTrial(
     const base::CommandLine& browser_command_line,
@@ skipping 1534 matching lines @@
 #if defined(OS_ANDROID)
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host);
   if (web_contents) {
     registry->AddInterface(
         web_contents->GetJavaInterfaces()
             ->CreateInterfaceFactory<payments::mojom::PaymentRequest>());
     registry->AddInterface(
         base::Bind(&ForwardShareServiceRequest,
                    web_contents->GetJavaInterfaces()->GetWeakPtr()));
-    if (AreExperimentalWebPlatformFeaturesEnabled()) {
-      registry->AddInterface(
-          web_contents->GetJavaInterfaces()
-              ->CreateInterfaceFactory<
-                  shape_detection::mojom::BarcodeDetection>());
-      registry->AddInterface(web_contents->GetJavaInterfaces()
-                                 ->CreateInterfaceFactory<
-                                     shape_detection::mojom::TextDetection>());
-    }
   }
 #elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
   // TODO(crbug.com/679127): Enable for MacViews implementation.
   if (AreExperimentalWebPlatformFeaturesEnabled()) {
     content::WebContents* web_contents =
         content::WebContents::FromRenderFrameHost(render_frame_host);
     if (web_contents) {
       registry->AddInterface(base::Bind(
           payments::CreatePaymentRequestForWebContents, web_contents));
     }
@@ skipping 344 matching lines @@
 bool ChromeContentBrowserClient::ShouldRedirectDOMStorageTaskRunner() {
   return variations::GetVariationParamValue(
              "BrowserScheduler", "RedirectDOMStorageTaskRunner") == "true";
 }
 
 bool ChromeContentBrowserClient::
     RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
   return variations::GetVariationParamValue(
              "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
 }