Revert "PpdProvider non-USB printer log spam fix"

This reverts commit ee11d579.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 676123 as the
culprit for failures in the build cycles as shown on:
https://analysis.chromium.org/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtL2VlMTFkNTc5ZDRhZWM3YWUzZGIzMmRiOWVlMTBkOWVjMThmMGVkNmYM

Sample Failed Build: https://ci.chromium.org/buildbot/chromium.memory/Linux%20ChromiumOS%20MSan%20Tests/13978

Sample Failed Step: chromeos_unittests

Original change's description:
> PpdProvider non-USB printer log spam fix
> 
> Currently calling ResolveUsbManufacturer for ALL printers that fail ppd
> matching; now correctly filtering for usb printers.
> 
> Bug: none
> Test: manually confirmed removed log spam
> Change-Id: I71b601d496001fc2c1ea14ca1281046f245d1c58
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1696187
> Reviewed-by: Sean Kau <skau@chromium.org>
> Commit-Queue: Luum Habtemariam <luum@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#676123}


Change-Id: If99b945acc97f9d361ab7f888591916781c984ef
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: none
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1696837
Cr-Commit-Position: refs/heads/master@{#676247}

chromeos/printing/ppd_provider.cc

@@ -491,17 +491,9 @@ class PpdProviderImpl : public PpdProvider {
         RunPpdReferenceResolutionSucceeded(std::move(next.cb),
                                            kEpsonGenericPPD);
       } else {
-        // We don't have anything else left to try.
-        if (search_data.discovery_type ==
-            PrinterSearchData::PrinterDiscoveryType::kUsb) {
-          // We've reached unsupported USB printer, try to grab the manufacturer
-          // name.
-          ResolveUsbManufacturer(std::move(next.cb), search_data.usb_vendor_id);
-        } else {
-          // Non-USB printer, so we fail resolution normally.
-          RunPpdReferenceResolutionNotFound(std::move(next.cb),
-                                            "" /* Empty Manufacturer */);
-        }
+        // We don't have anything else left to try. We've reached unsupported
+        // USB printer, try to grab the manufacturer name.
+        ResolveUsbManufacturer(std::move(next.cb), search_data.usb_vendor_id);
       }
     }
     // Didn't start any fetches.

chromeos/printing/ppd_provider_unittest.cc

@@ -954,7 +954,6 @@ TEST_F(PpdProviderTest, ResolveUsbManufacturer) {
   auto provider = CreateProvider("en", false);
 
   PrinterSearchData search_data;
-  search_data.discovery_type = PrinterSearchData::PrinterDiscoveryType::kUsb;
 
   // Vendor id that exists, nonexistent device id, should get a NOT_FOUND.
   // Although this is an unsupported printer model, we can still expect to get