Add Physical Web omnibox support for Android

components/omnibox/browser/autocomplete_classifier.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 "components/omnibox/browser/autocomplete_classifier.h"
 
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "build/build_config.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/browser/autocomplete_controller.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_provider.h"
 #include "url/gurl.h"
 
 // static
 const int AutocompleteClassifier::kDefaultOmniboxProviders =
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
+#if defined(OS_ANDROID) || defined(OS_IOS)
+    AutocompleteProvider::TYPE_PHYSICAL_WEB |

[Mark P, 2017/01/05 19:52:31]

Please comment, e.g., is this here because it's not implemented on desktop or
because it's a product decision or ...

[cco3, 2017/01/05 20:24:05]

Done.

+#else
     // Custom search engines cannot be used on mobile..

[Mark P, 2017/01/05 19:52:31]

nit: please remove the extra period while you're here.

[cco3, 2017/01/05 20:24:05]

Done.

     AutocompleteProvider::TYPE_KEYWORD |
 #endif
 #if !defined(OS_IOS)
     // "Builtin", "Shortcuts" and "Zero Suggest" are not supported on iOS.
     AutocompleteProvider::TYPE_BUILTIN |
     AutocompleteProvider::TYPE_SHORTCUTS |
     AutocompleteProvider::TYPE_ZERO_SUGGEST |
 #else
     // "URL from clipboard" can only be used on iOS.
     AutocompleteProvider::TYPE_CLIPBOARD_URL |
-    // Physical Web omnibox results are only implemented on iOS.
-    AutocompleteProvider::TYPE_PHYSICAL_WEB |
 #endif
     AutocompleteProvider::TYPE_BOOKMARK |
     AutocompleteProvider::TYPE_HISTORY_QUICK |
     AutocompleteProvider::TYPE_HISTORY_URL |
     AutocompleteProvider::TYPE_SEARCH;
 
 AutocompleteClassifier::AutocompleteClassifier(
     std::unique_ptr<AutocompleteController> controller,
     std::unique_ptr<AutocompleteSchemeClassifier> scheme_classifier)
     : controller_(std::move(controller)),
@@ skipping 28 matching lines @@
     if (alternate_nav_url)
       *alternate_nav_url = GURL();
     return;
   }
 
   DCHECK(result.default_match() != result.end());
   *match = *result.default_match();
   if (alternate_nav_url)
     *alternate_nav_url = result.alternate_nav_url();
 }