Reland 2:Geolocation: move from content/browser to device/

chrome/browser/geolocation/geolocation_browsertest.cc

 // Copyright (c) 2012 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 <stddef.h>
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/content_settings/core/browser/content_settings_usages_state.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/common/geoposition.h"
 #include "content/public/test/browser_test_utils.h"
+#include "device/geolocation/geoposition.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 namespace {
 
 std::string GetErrorCodePermissionDenied() {
-  return base::IntToString(content::Geoposition::ERROR_CODE_PERMISSION_DENIED);
+  return base::IntToString(device::Geoposition::ERROR_CODE_PERMISSION_DENIED);
 }
 
 std::string RunScript(content::RenderFrameHost* render_frame_host,
                       const std::string& script) {
   std::string result;
   EXPECT_TRUE(content::ExecuteScriptAndExtractString(render_frame_host, script,
                                                      &result));
   return result;
 }
 
@@ skipping 706 matching lines @@
   // Calling watchPosition should trigger the last usage update.
   WatchPositionAndObservePermissionRequest(false);
   ExpectPosition(fake_latitude(), fake_longitude());
 
   // Last usage has been updated.
   EXPECT_EQ(GetHostContentSettingsMap()->GetLastUsage(
       current_url().GetOrigin(),
       current_url().GetOrigin(),
       CONTENT_SETTINGS_TYPE_GEOLOCATION).ToDoubleT(), 13);
 }