Rename Origin.unique() to opaque().

content/browser/bluetooth/bluetooth_device_chooser_controller.cc

 // Copyright 2016 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 "content/browser/bluetooth/bluetooth_device_chooser_controller.h"
 
 #include <set>
 #include <string>
 #include <unordered_set>
 
@@ skipping 324 matching lines @@
   }
   BluetoothBlocklist::Get().RemoveExcludedUUIDs(options_.get());
 
   const url::Origin requesting_origin =
       render_frame_host_->GetLastCommittedOrigin();
   const url::Origin embedding_origin =
       web_contents_->GetMainFrame()->GetLastCommittedOrigin();
 
   // TODO(crbug.com/518042): Enforce correctly-delegated permissions instead of
   // matching origins. When relaxing this, take care to handle non-sandboxed
-  // unique origins.
+  // opaque origins.
   if (!embedding_origin.IsSameOriginWith(requesting_origin)) {
     PostErrorCallback(blink::mojom::WebBluetoothResult::
                           REQUEST_DEVICE_FROM_CROSS_ORIGIN_IFRAME);
     return;
   }
-  // The above also excludes unique origins, which are not even same-origin with
+  // The above also excludes opaque origins, which are not even same-origin with

[ortuno, 2017/02/23 21:59:34]

Do opaque origins still generate the same key in maps? If so could you change
this DCHECK to an if statement?

// Opaque origins generate the same key in maps, therefore are not
// supported.
// TODO(crbug.com/...): Change to REQUEST_DEVICE_FROM_UNSUPPORTED_ORIGIN.
if (request_origin.opaque()) {
  PostErrorCallback(blink::mojom::WebBluetoothResult::
                        REQUEST_DEVICE_FROM_CROSS_ORIGIN_IFRAME);
}

Please CC me and juncai in that bug.

[Mike West, 2017/02/24 08:01:45]

I'd suggest doing this in a separate patch. Mechanical changes are best kept
mechanical.

   // themselves.
-  DCHECK(!requesting_origin.unique());
+  // TODO: This is no longer true, and will crash here if embedding_origin is
+  // the same object as requesting_origin.
+  DCHECK(!requesting_origin.opaque());
 
   if (!adapter_->IsPresent()) {
     DVLOG(1) << "Bluetooth Adapter not present. Can't serve requestDevice.";
     RecordRequestDeviceOutcome(
         UMARequestDeviceOutcome::BLUETOOTH_ADAPTER_NOT_PRESENT);
     PostErrorCallback(blink::mojom::WebBluetoothResult::NO_BLUETOOTH_ADAPTER);
     return;
   }
 
   switch (GetContentClient()->browser()->AllowWebBluetooth(
@@ skipping 253 matching lines @@
 
 void BluetoothDeviceChooserController::PostErrorCallback(
     blink::mojom::WebBluetoothResult error) {
   if (!base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE, base::Bind(error_callback_, error))) {
     LOG(WARNING) << "No TaskRunner.";
   }
 }
 
 }  // namespace content