Move geolocation and permission mojoms into WebKit/public/platform.

content/browser/geolocation/geolocation_service_impl.cc

 // Copyright 2014 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/geolocation/geolocation_service_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "content/browser/geolocation/geolocation_service_context.h"
-#include "content/public/common/mojo_geoposition.mojom.h"
 
 namespace content {
 
 namespace {
 
 // Geoposition error codes for reporting in UMA.
 enum GeopositionErrorCode {
   // NOTE: Do not renumber these as that would confuse interpretation of
   // previously logged data. When making changes, also update the enum list
   // in tools/metrics/histograms/histograms.xml to keep it in sync.
@@ skipping 31 matching lines @@
       break;
   }
   UMA_HISTOGRAM_ENUMERATION("Geolocation.LocationUpdate.ErrorCode",
                             code,
                             GEOPOSITION_ERROR_CODE_COUNT);
 }
 
 }  // namespace
 
 GeolocationServiceImpl::GeolocationServiceImpl(
-    mojo::InterfaceRequest<mojom::GeolocationService> request,
+    mojo::InterfaceRequest<GeolocationService> request,
     GeolocationServiceContext* context,
     const base::Closure& update_callback)
     : binding_(this, std::move(request)),
       context_(context),
       update_callback_(update_callback),
       high_accuracy_(false),
       has_position_to_report_(false) {
   DCHECK(context_);
   binding_.set_connection_error_handler(
       base::Bind(&GeolocationServiceImpl::OnConnectionError,
                  base::Unretained(this)));
 }
 
 GeolocationServiceImpl::~GeolocationServiceImpl() {
   // Make sure to respond to any pending callback even without a valid position.
   if (!position_callback_.is_null()) {
     if (!current_position_.valid) {
-      current_position_.error_code = mojom::MojoGeoposition::ErrorCode(
+      current_position_.error_code = blink::mojom::Geoposition::ErrorCode(
           GEOPOSITION_ERROR_CODE_POSITION_UNAVAILABLE);
       current_position_.error_message = mojo::String("");
     }
     ReportCurrentPosition();
   }
 }
 
 void GeolocationServiceImpl::PauseUpdates() {
   geolocation_subscription_.reset();
 }
@@ skipping 78 matching lines @@
   current_position_.valid = position.Validate();
   current_position_.latitude = position.latitude;
   current_position_.longitude = position.longitude;
   current_position_.altitude = position.altitude;
   current_position_.accuracy = position.accuracy;
   current_position_.altitude_accuracy = position.altitude_accuracy;
   current_position_.heading = position.heading;
   current_position_.speed = position.speed;
   current_position_.timestamp = position.timestamp.ToDoubleT();
   current_position_.error_code =
-      mojom::MojoGeoposition::ErrorCode(position.error_code);
+      blink::mojom::Geoposition::ErrorCode(position.error_code);
   current_position_.error_message = position.error_message;
 
   has_position_to_report_ = true;
 
   if (!position_callback_.is_null())
     ReportCurrentPosition();
 }
 
 void GeolocationServiceImpl::ReportCurrentPosition() {
   position_callback_.Run(current_position_.Clone());
   position_callback_.reset();
   has_position_to_report_ = false;
 }
 
 }  // namespace content