Move chrome/browser/chromeos/geolocation to chromeos/geolocation

In favor of less things to have in chrome/browser/chromeos.

BUG=437691
TEST=everything builds as before

Review URL: https://codereview.chromium.org/786693002

Cr-Commit-Position: refs/heads/master@{#308183}

chrome/browser/chromeos/login/wizard_controller.cc

@@ -25,7 +25,6 @@
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/chromeos/customization/customization_document.h"
-#include "chrome/browser/chromeos/geolocation/simple_geolocation_provider.h"
 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_mode.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
@@ -69,6 +68,7 @@
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
+#include "chromeos/geolocation/simple_geolocation_provider.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/portal_detector/network_portal_detector.h"

chrome/browser/chromeos/login/wizard_controller_browsertest.cc

@@ -19,7 +19,6 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/base/locale_util.h"
-#include "chrome/browser/chromeos/geolocation/simple_geolocation_provider.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h"
 #include "chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.h"
@@ -58,6 +57,7 @@
 #include "chromeos/chromeos_test_utils.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
+#include "chromeos/geolocation/simple_geolocation_provider.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/settings/timezone_settings.h"

chrome/browser/chromeos/timezone/timezone_provider.cc

@@ -10,7 +10,7 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/time/time.h"
-#include "chrome/browser/chromeos/geolocation/geoposition.h"
+#include "chromeos/geolocation/geoposition.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"
 

chrome/browser/chromeos/timezone/timezone_request.cc

@@ -13,7 +13,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/geolocation/geoposition.h"
+#include "chromeos/geolocation/geoposition.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"

chrome/browser/chromeos/timezone/timezone_request.h

@@ -12,7 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "base/timer/timer.h"
-#include "chrome/browser/chromeos/geolocation/geoposition.h"
+#include "chromeos/geolocation/geoposition.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"

chrome/browser/chromeos/timezone/timezone_unittest.cc

@@ -4,8 +4,8 @@
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "chrome/browser/chromeos/geolocation/geoposition.h"
 #include "chrome/browser/chromeos/timezone/timezone_provider.h"
+#include "chromeos/geolocation/geoposition.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"

chrome/chrome_browser_chromeos.gypi

@@ -359,12 +359,6 @@
         'browser/chromeos/first_run/steps/tray_step.cc',
         'browser/chromeos/first_run/steps/tray_step.h',
         'browser/chromeos/genius_app/app_id.h',
-        'browser/chromeos/geolocation/geoposition.cc',
-        'browser/chromeos/geolocation/geoposition.h',
-        'browser/chromeos/geolocation/simple_geolocation_provider.cc',
-        'browser/chromeos/geolocation/simple_geolocation_provider.h',
-        'browser/chromeos/geolocation/simple_geolocation_request.cc',
-        'browser/chromeos/geolocation/simple_geolocation_request.h',
         'browser/chromeos/idle_detector.cc',
         'browser/chromeos/idle_detector.h',
         'browser/chromeos/input_method/accessibility.cc',

chrome/chrome_tests_unit.gypi

@@ -180,7 +180,6 @@
       'browser/chromeos/fileapi/external_file_url_util_unittest.cc',
       'browser/chromeos/fileapi/file_access_permissions_unittest.cc',
       'browser/chromeos/fileapi/file_system_backend_unittest.cc',
-      'browser/chromeos/geolocation/simple_geolocation_unittest.cc',
       'browser/chromeos/input_method/browser_state_monitor_unittest.cc',
       'browser/chromeos/input_method/input_method_configuration_unittest.cc',
       'browser/chromeos/input_method/input_method_engine_unittest.cc',

chromeos/chromeos.gyp

@@ -256,6 +256,12 @@
       'device_event_log_impl.h',
       'disks/disk_mount_manager.cc',
       'disks/disk_mount_manager.h',
+      'geolocation/geoposition.cc',
+      'geolocation/geoposition.h',
+      'geolocation/simple_geolocation_provider.cc',
+      'geolocation/simple_geolocation_provider.h',
+      'geolocation/simple_geolocation_request.cc',
+      'geolocation/simple_geolocation_request.h',
       'login/auth/auth_attempt_state.cc',
       'login/auth/auth_attempt_state.h',
       'login/auth/auth_attempt_state_resolver.cc',
@@ -436,6 +442,7 @@
       'dbus/shill_third_party_vpn_driver_client_unittest.cc',
       'device_event_log_impl_unittest.cc',
       'disks/disk_mount_manager_unittest.cc',
+      'geolocation/simple_geolocation_unittest.cc',
       'login/auth/key_unittest.cc',
       'login/login_state_unittest.cc',
       'network/auto_connect_handler_unittest.cc',

chromeos/geolocation/DEPS

+include_rules = [
+  "+google_apis",
+]
\ No newline at end of file

chrome/browser/chromeos/geolocation/geoposition.cc → chromeos/geolocation/geoposition.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/geolocation/geoposition.h"
+#include "chromeos/geolocation/geoposition.h"
 
 #include "base/strings/stringprintf.h"
 
@@ -49,6 +49,6 @@ std::string Geoposition::ToString() const {
       error_message.c_str(),
       (unsigned)status,
       (status < arraysize(status2string) ? status2string[status] : "unknown"));
-};
+}
 
 }  // namespace chromeos

chrome/browser/chromeos/geolocation/geoposition.h → chromeos/geolocation/geoposition.h

@@ -2,18 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GEOLOCATION_GEOPOSITION_H_
-#define CHROME_BROWSER_CHROMEOS_GEOLOCATION_GEOPOSITION_H_
+#ifndef CHROMEOS_GEOLOCATION_GEOPOSITION_H_
+#define CHROMEOS_GEOLOCATION_GEOPOSITION_H_
 
 #include <string>
 
 #include "base/time/time.h"
+#include "chromeos/chromeos_export.h"
 
 namespace chromeos {
 
 // This structure represents Google Maps Geolocation response.
 // Based on content/public/common/geoposition.h .
-struct Geoposition {
+struct CHROMEOS_EXPORT Geoposition {
   // Geolocation API client status.
   // (Server status is reported in "error_code" field.)
   enum Status {
@@ -62,4 +63,4 @@ struct Geoposition {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_GEOLOCATION_GEOPOSITION_H_
+#endif  // CHROMEOS_GEOLOCATION_GEOPOSITION_H_

chrome/browser/chromeos/geolocation/simple_geolocation_provider.cc → chromeos/geolocation/simple_geolocation_provider.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/geolocation/simple_geolocation_provider.h"
+#include "chromeos/geolocation/simple_geolocation_provider.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/time/time.h"
-#include "chrome/browser/chromeos/geolocation/geoposition.h"
+#include "chromeos/geolocation/geoposition.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"
 

chrome/browser/chromeos/geolocation/simple_geolocation_provider.h → chromeos/geolocation/simple_geolocation_provider.h

@@ -2,15 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GEOLOCATION_SIMPLE_GEOLOCATION_PROVIDER_H_
-#define CHROME_BROWSER_CHROMEOS_GEOLOCATION_SIMPLE_GEOLOCATION_PROVIDER_H_
+#ifndef CHROMEOS_GEOLOCATION_SIMPLE_GEOLOCATION_PROVIDER_H_
+#define CHROMEOS_GEOLOCATION_SIMPLE_GEOLOCATION_PROVIDER_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
-#include "chrome/browser/chromeos/geolocation/simple_geolocation_request.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/geolocation/simple_geolocation_request.h"
 #include "url/gurl.h"
 
 namespace net {
@@ -26,7 +27,7 @@ namespace chromeos {
 // Note: this should probably be a singleton to monitor requests rate.
 // But as it is used only diring ChromeOS Out-of-Box, it can be owned by
 // WizardController for now.
-class SimpleGeolocationProvider {
+class CHROMEOS_EXPORT SimpleGeolocationProvider {
  public:
   SimpleGeolocationProvider(net::URLRequestContextGetter* url_context_getter,
                             const GURL& url);
@@ -69,4 +70,4 @@ class SimpleGeolocationProvider {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_GEOLOCATION_SIMPLE_GEOLOCATION_PROVIDER_H_
+#endif  // CHROMEOS_GEOLOCATION_SIMPLE_GEOLOCATION_PROVIDER_H_

chrome/browser/chromeos/geolocation/simple_geolocation_request.cc → chromeos/geolocation/simple_geolocation_request.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/geolocation/simple_geolocation_request.h"
+#include "chromeos/geolocation/simple_geolocation_request.h"
 
 #include <algorithm>
 #include <string>
@@ -14,8 +14,8 @@
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/geolocation/geoposition.h"
-#include "chrome/browser/chromeos/geolocation/simple_geolocation_provider.h"
+#include "chromeos/geolocation/geoposition.h"
+#include "chromeos/geolocation/simple_geolocation_provider.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"

chrome/browser/chromeos/geolocation/simple_geolocation_request.h → chromeos/geolocation/simple_geolocation_request.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GEOLOCATION_SIMPLE_GEOLOCATION_REQUEST_H_
-#define CHROME_BROWSER_CHROMEOS_GEOLOCATION_SIMPLE_GEOLOCATION_REQUEST_H_
+#ifndef CHROMEOS_GEOLOCATION_SIMPLE_GEOLOCATION_REQUEST_H_
+#define CHROMEOS_GEOLOCATION_SIMPLE_GEOLOCATION_REQUEST_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ -12,7 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "base/timer/timer.h"
-#include "chrome/browser/chromeos/geolocation/geoposition.h"
+#include "chromeos/geolocation/geoposition.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
@@ -122,4 +122,4 @@ class SimpleGeolocationRequest : private net::URLFetcherDelegate {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_GEOLOCATION_SIMPLE_GEOLOCATION_REQUEST_H_
+#endif  // CHROMEOS_GEOLOCATION_SIMPLE_GEOLOCATION_REQUEST_H_

chrome/browser/chromeos/geolocation/simple_geolocation_unittest.cc → chromeos/geolocation/simple_geolocation_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "chrome/browser/chromeos/geolocation/simple_geolocation_provider.h"
+#include "chromeos/geolocation/simple_geolocation_provider.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"