Use GetLastCommittedOrigin instead of GetLastCommittedURL in bluetooth chooser

content/shell/browser/layout_test/layout_test_bluetooth_chooser_factory.cc

 // Copyright 2015 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/shell/browser/layout_test/layout_test_bluetooth_chooser_factory.h"
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
-#include "url/gurl.h"
+#include "url/origin.h"
 
 namespace content {
 
 class WebContents;
 
 // Implements a Bluetooth chooser that records events it's sent, instead of
 // showing a dialog. It allows tests to control how the chooser responds.
 class LayoutTestBluetoothChooserFactory::Chooser : public BluetoothChooser {
  public:
   Chooser(const base::WeakPtr<LayoutTestBluetoothChooserFactory>& factory,
@@ skipping 75 matching lines @@
     : weak_this_(this) {}
 
 LayoutTestBluetoothChooserFactory::~LayoutTestBluetoothChooserFactory() {
   SendEvent(BluetoothChooser::Event::CANCELLED, "");
 }
 
 scoped_ptr<BluetoothChooser>
 LayoutTestBluetoothChooserFactory::RunBluetoothChooser(
     WebContents* web_contents,
     const BluetoothChooser::EventHandler& event_handler,
-    const GURL& origin) {
+    const url::Origin& origin) {
+  DCHECK(!origin.unique());
   std::string event = "chooser-opened(";
-  event += origin.spec();
+  event += origin.Serialize();
   event += ")";
   events_.push_back(event);
   return make_scoped_ptr(new Chooser(weak_this_.GetWeakPtr(), event_handler));
 }
 
 std::vector<std::string>
 LayoutTestBluetoothChooserFactory::GetAndResetEvents() {
   std::vector<std::string> result;
   result.swap(events_);
   return result;
 }
 
 void LayoutTestBluetoothChooserFactory::SendEvent(
     BluetoothChooser::Event event,
     const std::string& device_id) {
   // Copy |choosers_| to make sure event handler executions that modify
   // |choosers_| don't invalidate iterators.
   std::vector<Chooser*> choosers_copy(choosers_.begin(), choosers_.end());
   for (Chooser* chooser : choosers_copy) {
     chooser->event_handler.Run(event, device_id);
   }
 }
 
 }  // namespace content