Commit 63daf7ca authored by vmpstr's avatar vmpstr Committed by Commit bot

extensions: Change auto to not deduce raw pointers.

This patch updates the code to prevent auto deducing to a raw pointer.

R=benwells@chromium.org, danakj, dcheng
BUG=554600

Review-Url: https://codereview.chromium.org/2108623005
Cr-Commit-Position: refs/heads/master@{#403298}
parent 1e7a5421
...@@ -135,9 +135,8 @@ ExtensionFunction* FakeSerialConnectFunctionFactory() { ...@@ -135,9 +135,8 @@ ExtensionFunction* FakeSerialConnectFunctionFactory() {
void CreateTestSerialServiceOnFileThread( void CreateTestSerialServiceOnFileThread(
mojo::InterfaceRequest<device::serial::SerialService> request) { mojo::InterfaceRequest<device::serial::SerialService> request) {
auto io_handler_factory = base::Bind(&FakeEchoSerialIoHandler::Create); auto io_handler_factory = base::Bind(&FakeEchoSerialIoHandler::Create);
auto connection_factory = new device::SerialConnectionFactory( auto* connection_factory = new device::SerialConnectionFactory(
io_handler_factory, io_handler_factory, content::BrowserThread::GetMessageLoopProxyForThread(
content::BrowserThread::GetMessageLoopProxyForThread(
content::BrowserThread::IO)); content::BrowserThread::IO));
std::unique_ptr<device::SerialDeviceEnumerator> device_enumerator( std::unique_ptr<device::SerialDeviceEnumerator> device_enumerator(
new FakeSerialDeviceEnumerator); new FakeSerialDeviceEnumerator);
......
...@@ -132,7 +132,7 @@ bool IsWebRequestEvent(const std::string& event_name) { ...@@ -132,7 +132,7 @@ bool IsWebRequestEvent(const std::string& event_name) {
web_request_event_name.replace( web_request_event_name.replace(
0, strlen(webview::kWebViewEventPrefix), kWebRequestEventPrefix); 0, strlen(webview::kWebViewEventPrefix), kWebRequestEventPrefix);
} }
const auto web_request_events_end = auto* const* web_request_events_end =
kWebRequestEvents + arraysize(kWebRequestEvents); kWebRequestEvents + arraysize(kWebRequestEvents);
return std::find(kWebRequestEvents, web_request_events_end, return std::find(kWebRequestEvents, web_request_events_end,
web_request_event_name) != web_request_events_end; web_request_event_name) != web_request_events_end;
......
...@@ -179,7 +179,7 @@ EventRouter::EventRouter(BrowserContext* browser_context, ...@@ -179,7 +179,7 @@ EventRouter::EventRouter(BrowserContext* browser_context,
} }
EventRouter::~EventRouter() { EventRouter::~EventRouter() {
for (auto process : observed_process_set_) for (auto* process : observed_process_set_)
process->RemoveObserver(this); process->RemoveObserver(this);
} }
......
...@@ -44,7 +44,7 @@ ExtensionNavigationThrottle::WillStartRequest() { ...@@ -44,7 +44,7 @@ ExtensionNavigationThrottle::WillStartRequest() {
// the ancestor chain, so find the current RenderFrameHost and use it to // the ancestor chain, so find the current RenderFrameHost and use it to
// traverse up to the main frame. // traverse up to the main frame.
content::RenderFrameHost* navigating_frame = nullptr; content::RenderFrameHost* navigating_frame = nullptr;
for (auto frame : navigation_handle()->GetWebContents()->GetAllFrames()) { for (auto* frame : navigation_handle()->GetWebContents()->GetAllFrames()) {
if (frame->GetFrameTreeNodeId() == if (frame->GetFrameTreeNodeId() ==
navigation_handle()->GetFrameTreeNodeId()) { navigation_handle()->GetFrameTreeNodeId()) {
navigating_frame = frame; navigating_frame = frame;
......
...@@ -226,7 +226,7 @@ void ExtensionOptionsGuest::DidNavigateMainFrame( ...@@ -226,7 +226,7 @@ void ExtensionOptionsGuest::DidNavigateMainFrame(
const content::LoadCommittedDetails& details, const content::LoadCommittedDetails& details,
const content::FrameNavigateParams& params) { const content::FrameNavigateParams& params) {
if (attached()) { if (attached()) {
auto guest_zoom_controller = auto* guest_zoom_controller =
zoom::ZoomController::FromWebContents(web_contents()); zoom::ZoomController::FromWebContents(web_contents());
guest_zoom_controller->SetZoomMode( guest_zoom_controller->SetZoomMode(
zoom::ZoomController::ZOOM_MODE_ISOLATED); zoom::ZoomController::ZOOM_MODE_ISOLATED);
......
...@@ -76,7 +76,7 @@ bool ExtensionsGuestViewMessageFilter::OnMessageReceived( ...@@ -76,7 +76,7 @@ bool ExtensionsGuestViewMessageFilter::OnMessageReceived(
GuestViewManager* ExtensionsGuestViewMessageFilter:: GuestViewManager* ExtensionsGuestViewMessageFilter::
GetOrCreateGuestViewManager() { GetOrCreateGuestViewManager() {
auto manager = GuestViewManager::FromBrowserContext(browser_context_); auto* manager = GuestViewManager::FromBrowserContext(browser_context_);
if (!manager) { if (!manager) {
manager = GuestViewManager::CreateWithDelegate( manager = GuestViewManager::CreateWithDelegate(
browser_context_, browser_context_,
...@@ -104,10 +104,10 @@ void ExtensionsGuestViewMessageFilter::OnCreateMimeHandlerViewGuest( ...@@ -104,10 +104,10 @@ void ExtensionsGuestViewMessageFilter::OnCreateMimeHandlerViewGuest(
int element_instance_id, int element_instance_id,
const gfx::Size& element_size) { const gfx::Size& element_size) {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
auto manager = GetOrCreateGuestViewManager(); auto* manager = GetOrCreateGuestViewManager();
auto rfh = RenderFrameHost::FromID(render_process_id_, render_frame_id); auto* rfh = RenderFrameHost::FromID(render_process_id_, render_frame_id);
auto embedder_web_contents = WebContents::FromRenderFrameHost(rfh); auto* embedder_web_contents = WebContents::FromRenderFrameHost(rfh);
if (!embedder_web_contents) if (!embedder_web_contents)
return; return;
...@@ -135,15 +135,15 @@ void ExtensionsGuestViewMessageFilter::OnResizeGuest( ...@@ -135,15 +135,15 @@ void ExtensionsGuestViewMessageFilter::OnResizeGuest(
int render_frame_id, int render_frame_id,
int element_instance_id, int element_instance_id,
const gfx::Size& new_size) { const gfx::Size& new_size) {
auto manager = GuestViewManager::FromBrowserContext(browser_context_); auto* manager = GuestViewManager::FromBrowserContext(browser_context_);
// We should have a GuestViewManager at this point. If we don't then the // We should have a GuestViewManager at this point. If we don't then the
// embedder is misbehaving. // embedder is misbehaving.
if (!manager) if (!manager)
return; return;
auto guest_web_contents = auto* guest_web_contents =
manager->GetGuestByInstanceID(render_process_id_, element_instance_id); manager->GetGuestByInstanceID(render_process_id_, element_instance_id);
auto mhvg = MimeHandlerViewGuest::FromWebContents(guest_web_contents); auto* mhvg = MimeHandlerViewGuest::FromWebContents(guest_web_contents);
if (!mhvg) if (!mhvg)
return; return;
...@@ -159,12 +159,12 @@ void ExtensionsGuestViewMessageFilter::MimeHandlerViewGuestCreatedCallback( ...@@ -159,12 +159,12 @@ void ExtensionsGuestViewMessageFilter::MimeHandlerViewGuestCreatedCallback(
int embedder_render_frame_id, int embedder_render_frame_id,
const gfx::Size& element_size, const gfx::Size& element_size,
WebContents* web_contents) { WebContents* web_contents) {
auto guest_view = MimeHandlerViewGuest::FromWebContents(web_contents); auto* guest_view = MimeHandlerViewGuest::FromWebContents(web_contents);
if (!guest_view) if (!guest_view)
return; return;
int guest_instance_id = guest_view->guest_instance_id(); int guest_instance_id = guest_view->guest_instance_id();
auto rfh = RenderFrameHost::FromID(embedder_render_process_id, auto* rfh = RenderFrameHost::FromID(embedder_render_process_id,
embedder_render_frame_id); embedder_render_frame_id);
if (!rfh) if (!rfh)
return; return;
...@@ -172,7 +172,7 @@ void ExtensionsGuestViewMessageFilter::MimeHandlerViewGuestCreatedCallback( ...@@ -172,7 +172,7 @@ void ExtensionsGuestViewMessageFilter::MimeHandlerViewGuestCreatedCallback(
base::DictionaryValue attach_params; base::DictionaryValue attach_params;
attach_params.SetInteger(guest_view::kElementWidth, element_size.width()); attach_params.SetInteger(guest_view::kElementWidth, element_size.width());
attach_params.SetInteger(guest_view::kElementHeight, element_size.height()); attach_params.SetInteger(guest_view::kElementHeight, element_size.height());
auto manager = GuestViewManager::FromBrowserContext(browser_context_); auto* manager = GuestViewManager::FromBrowserContext(browser_context_);
CHECK(manager); CHECK(manager);
manager->AttachGuest(embedder_render_process_id, manager->AttachGuest(embedder_render_process_id,
element_instance_id, element_instance_id,
......
...@@ -239,7 +239,7 @@ void WebViewGuest::CleanUp(content::BrowserContext* browser_context, ...@@ -239,7 +239,7 @@ void WebViewGuest::CleanUp(content::BrowserContext* browser_context,
view_instance_id)); view_instance_id));
// Clean up content scripts for the WebView. // Clean up content scripts for the WebView.
auto csm = WebViewContentScriptManager::Get(browser_context); auto* csm = WebViewContentScriptManager::Get(browser_context);
csm->RemoveAllContentScriptsForWebView(embedder_process_id, view_instance_id); csm->RemoveAllContentScriptsForWebView(embedder_process_id, view_instance_id);
// Allow an extensions browser client to potentially perform more cleanup. // Allow an extensions browser client to potentially perform more cleanup.
...@@ -303,7 +303,7 @@ int WebViewGuest::GetOrGenerateRulesRegistryID( ...@@ -303,7 +303,7 @@ int WebViewGuest::GetOrGenerateRulesRegistryID(
if (it != web_view_key_to_id_map.Get().end()) if (it != web_view_key_to_id_map.Get().end())
return it->second; return it->second;
auto rph = RenderProcessHost::FromID(embedder_process_id); auto* rph = RenderProcessHost::FromID(embedder_process_id);
int rules_registry_id = int rules_registry_id =
RulesRegistryService::Get(rph->GetBrowserContext())-> RulesRegistryService::Get(rph->GetBrowserContext())->
GetNextRulesRegistryID(); GetNextRulesRegistryID();
...@@ -347,7 +347,7 @@ void WebViewGuest::CreateWebContents( ...@@ -347,7 +347,7 @@ void WebViewGuest::CreateWebContents(
// If we already have a webview tag in the same app using the same storage // If we already have a webview tag in the same app using the same storage
// partition, we should use the same SiteInstance so the existing tag and // partition, we should use the same SiteInstance so the existing tag and
// the new tag can script each other. // the new tag can script each other.
auto guest_view_manager = GuestViewManager::FromBrowserContext( auto* guest_view_manager = GuestViewManager::FromBrowserContext(
owner_render_process_host->GetBrowserContext()); owner_render_process_host->GetBrowserContext());
scoped_refptr<content::SiteInstance> guest_site_instance = scoped_refptr<content::SiteInstance> guest_site_instance =
guest_view_manager->GetGuestSiteInstance(guest_site); guest_view_manager->GetGuestSiteInstance(guest_site);
...@@ -987,7 +987,7 @@ void WebViewGuest::RequestPointerLockPermission( ...@@ -987,7 +987,7 @@ void WebViewGuest::RequestPointerLockPermission(
} }
void WebViewGuest::SignalWhenReady(const base::Closure& callback) { void WebViewGuest::SignalWhenReady(const base::Closure& callback) {
auto manager = WebViewContentScriptManager::Get(browser_context()); auto* manager = WebViewContentScriptManager::Get(browser_context());
manager->SignalOnScriptsLoaded(callback); manager->SignalOnScriptsLoaded(callback);
} }
...@@ -1153,7 +1153,7 @@ void WebViewGuest::SetName(const std::string& name) { ...@@ -1153,7 +1153,7 @@ void WebViewGuest::SetName(const std::string& name) {
} }
void WebViewGuest::SetZoom(double zoom_factor) { void WebViewGuest::SetZoom(double zoom_factor) {
auto zoom_controller = ZoomController::FromWebContents(web_contents()); auto* zoom_controller = ZoomController::FromWebContents(web_contents());
DCHECK(zoom_controller); DCHECK(zoom_controller);
double zoom_level = content::ZoomFactorToZoomLevel(zoom_factor); double zoom_level = content::ZoomFactorToZoomLevel(zoom_factor);
zoom_controller->SetZoomLevel(zoom_level); zoom_controller->SetZoomLevel(zoom_level);
...@@ -1317,7 +1317,7 @@ void WebViewGuest::WebContentsCreated(WebContents* source_contents, ...@@ -1317,7 +1317,7 @@ void WebViewGuest::WebContentsCreated(WebContents* source_contents,
const std::string& frame_name, const std::string& frame_name,
const GURL& target_url, const GURL& target_url,
WebContents* new_contents) { WebContents* new_contents) {
auto guest = WebViewGuest::FromWebContents(new_contents); auto* guest = WebViewGuest::FromWebContents(new_contents);
CHECK(guest); CHECK(guest);
guest->SetOpener(this); guest->SetOpener(this);
guest->name_ = frame_name; guest->name_ = frame_name;
...@@ -1409,7 +1409,7 @@ void WebViewGuest::RequestNewWindowPermission(WindowOpenDisposition disposition, ...@@ -1409,7 +1409,7 @@ void WebViewGuest::RequestNewWindowPermission(WindowOpenDisposition disposition,
const gfx::Rect& initial_bounds, const gfx::Rect& initial_bounds,
bool user_gesture, bool user_gesture,
WebContents* new_contents) { WebContents* new_contents) {
auto guest = WebViewGuest::FromWebContents(new_contents); auto* guest = WebViewGuest::FromWebContents(new_contents);
if (!guest) if (!guest)
return; return;
auto it = pending_new_windows_.find(guest); auto it = pending_new_windows_.find(guest);
...@@ -1461,7 +1461,7 @@ void WebViewGuest::OnWebViewNewWindowResponse( ...@@ -1461,7 +1461,7 @@ void WebViewGuest::OnWebViewNewWindowResponse(
int new_window_instance_id, int new_window_instance_id,
bool allow, bool allow,
const std::string& user_input) { const std::string& user_input) {
auto guest = auto* guest =
WebViewGuest::From(owner_web_contents()->GetRenderProcessHost()->GetID(), WebViewGuest::From(owner_web_contents()->GetRenderProcessHost()->GetID(),
new_window_instance_id); new_window_instance_id);
if (!guest) if (!guest)
......
...@@ -252,7 +252,7 @@ bool LeveldbValueStore::OnMemoryDump( ...@@ -252,7 +252,7 @@ bool LeveldbValueStore::OnMemoryDump(
res = base::StringToUint64(value, &size); res = base::StringToUint64(value, &size);
DCHECK(res); DCHECK(res);
auto dump = pmd->CreateAllocatorDump(base::StringPrintf( auto* dump = pmd->CreateAllocatorDump(base::StringPrintf(
"leveldb/value_store/%s/0x%" PRIXPTR, open_histogram_name().c_str(), "leveldb/value_store/%s/0x%" PRIXPTR, open_histogram_name().c_str(),
reinterpret_cast<uintptr_t>(this))); reinterpret_cast<uintptr_t>(this)));
dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize, dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
......
...@@ -137,7 +137,7 @@ void GuestViewInternalCustomBindings::AttachGuest( ...@@ -137,7 +137,7 @@ void GuestViewInternalCustomBindings::AttachGuest(
int element_instance_id = args[0]->Int32Value(); int element_instance_id = args[0]->Int32Value();
// An element instance ID uniquely identifies a GuestViewContainer. // An element instance ID uniquely identifies a GuestViewContainer.
auto guest_view_container = auto* guest_view_container =
guest_view::GuestViewContainer::FromID(element_instance_id); guest_view::GuestViewContainer::FromID(element_instance_id);
// TODO(fsamuel): Should we be reporting an error if the element instance ID // TODO(fsamuel): Should we be reporting an error if the element instance ID
...@@ -182,7 +182,7 @@ void GuestViewInternalCustomBindings::DetachGuest( ...@@ -182,7 +182,7 @@ void GuestViewInternalCustomBindings::DetachGuest(
int element_instance_id = args[0]->Int32Value(); int element_instance_id = args[0]->Int32Value();
// An element instance ID uniquely identifies a GuestViewContainer. // An element instance ID uniquely identifies a GuestViewContainer.
auto guest_view_container = auto* guest_view_container =
guest_view::GuestViewContainer::FromID(element_instance_id); guest_view::GuestViewContainer::FromID(element_instance_id);
// TODO(fsamuel): Should we be reporting an error if the element instance ID // TODO(fsamuel): Should we be reporting an error if the element instance ID
...@@ -382,7 +382,7 @@ void GuestViewInternalCustomBindings::RegisterElementResizeCallback( ...@@ -382,7 +382,7 @@ void GuestViewInternalCustomBindings::RegisterElementResizeCallback(
int element_instance_id = args[0]->Int32Value(); int element_instance_id = args[0]->Int32Value();
// An element instance ID uniquely identifies a ExtensionsGuestViewContainer // An element instance ID uniquely identifies a ExtensionsGuestViewContainer
// within a RenderView. // within a RenderView.
auto guest_view_container = static_cast<ExtensionsGuestViewContainer*>( auto* guest_view_container = static_cast<ExtensionsGuestViewContainer*>(
guest_view::GuestViewContainer::FromID(element_instance_id)); guest_view::GuestViewContainer::FromID(element_instance_id));
if (!guest_view_container) if (!guest_view_container)
return; return;
...@@ -408,7 +408,7 @@ void GuestViewInternalCustomBindings::RegisterView( ...@@ -408,7 +408,7 @@ void GuestViewInternalCustomBindings::RegisterView(
// ID as the key. The reference is made weak so that it will not extend the // ID as the key. The reference is made weak so that it will not extend the
// lifetime of the object. // lifetime of the object.
int view_instance_id = args[0]->Int32Value(); int view_instance_id = args[0]->Int32Value();
auto object = auto* object =
new v8::Global<v8::Object>(args.GetIsolate(), args[1].As<v8::Object>()); new v8::Global<v8::Object>(args.GetIsolate(), args[1].As<v8::Object>());
weak_view_map.Get().insert(std::make_pair(view_instance_id, object)); weak_view_map.Get().insert(std::make_pair(view_instance_id, object));
......
...@@ -179,7 +179,7 @@ std::set<base::FilePath> TestExtensionsClient::GetBrowserImagePaths( ...@@ -179,7 +179,7 @@ std::set<base::FilePath> TestExtensionsClient::GetBrowserImagePaths(
const Extension* extension) { const Extension* extension) {
std::set<base::FilePath> result = std::set<base::FilePath> result =
ExtensionsClient::GetBrowserImagePaths(extension); ExtensionsClient::GetBrowserImagePaths(extension);
for (auto filter : browser_image_filters_) for (auto* filter : browser_image_filters_)
filter->Filter(extension, &result); filter->Filter(extension, &result);
return result; return result;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment