Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Side by Side Diff: content/shell/browser/layout_test/layout_test_bluetooth_chooser_factory.cc

Issue 2716583003: Rename Origin.unique() to opaque().
Patch Set: Mac fixes Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/browser/layout_test/layout_test_bluetooth_chooser_factor y.h" 5 #include "content/shell/browser/layout_test/layout_test_bluetooth_chooser_factor y.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/public/browser/render_frame_host.h" 10 #include "content/public/browser/render_frame_host.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 102
103 LayoutTestBluetoothChooserFactory::~LayoutTestBluetoothChooserFactory() { 103 LayoutTestBluetoothChooserFactory::~LayoutTestBluetoothChooserFactory() {
104 SendEvent(BluetoothChooser::Event::CANCELLED, ""); 104 SendEvent(BluetoothChooser::Event::CANCELLED, "");
105 } 105 }
106 106
107 std::unique_ptr<BluetoothChooser> 107 std::unique_ptr<BluetoothChooser>
108 LayoutTestBluetoothChooserFactory::RunBluetoothChooser( 108 LayoutTestBluetoothChooserFactory::RunBluetoothChooser(
109 RenderFrameHost* frame, 109 RenderFrameHost* frame,
110 const BluetoothChooser::EventHandler& event_handler) { 110 const BluetoothChooser::EventHandler& event_handler) {
111 const url::Origin origin = frame->GetLastCommittedOrigin(); 111 const url::Origin origin = frame->GetLastCommittedOrigin();
112 DCHECK(!origin.unique()); 112 DCHECK(!origin.opaque());
113 std::string event = "chooser-opened("; 113 std::string event = "chooser-opened(";
114 event += origin.Serialize(); 114 event += origin.Serialize();
115 event += ")"; 115 event += ")";
116 events_.push_back(event); 116 events_.push_back(event);
117 return base::MakeUnique<Chooser>(weak_this_.GetWeakPtr(), event_handler); 117 return base::MakeUnique<Chooser>(weak_this_.GetWeakPtr(), event_handler);
118 } 118 }
119 119
120 std::vector<std::string> 120 std::vector<std::string>
121 LayoutTestBluetoothChooserFactory::GetAndResetEvents() { 121 LayoutTestBluetoothChooserFactory::GetAndResetEvents() {
122 std::vector<std::string> result; 122 std::vector<std::string> result;
123 result.swap(events_); 123 result.swap(events_);
124 return result; 124 return result;
125 } 125 }
126 126
127 void LayoutTestBluetoothChooserFactory::SendEvent( 127 void LayoutTestBluetoothChooserFactory::SendEvent(
128 BluetoothChooser::Event event, 128 BluetoothChooser::Event event,
129 const std::string& device_id) { 129 const std::string& device_id) {
130 // Copy |choosers_| to make sure event handler executions that modify 130 // Copy |choosers_| to make sure event handler executions that modify
131 // |choosers_| don't invalidate iterators. 131 // |choosers_| don't invalidate iterators.
132 std::vector<Chooser*> choosers_copy(choosers_.begin(), choosers_.end()); 132 std::vector<Chooser*> choosers_copy(choosers_.begin(), choosers_.end());
133 for (Chooser* chooser : choosers_copy) { 133 for (Chooser* chooser : choosers_copy) {
134 chooser->event_handler.Run(event, device_id); 134 chooser->event_handler.Run(event, device_id);
135 } 135 }
136 } 136 }
137 137
138 } // namespace content 138 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698