chrome/browser/geolocation/geolocation_browsertest.cc - Issue 5606002: Move:...

Side by Side Diff: chrome/browser/geolocation/geolocation_browsertest.cc

Issue 5606002: Move:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/first_run/first_run_win.cc ('k') | chrome/browser/geolocation/geolocation_content_settings_map.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2009 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 "base/compiler_specific.h"	5 #include "base/compiler_specific.h"

6 #include "base/string_number_conversions.h"	6 #include "base/string_number_conversions.h"

7 #include "base/string_util.h"	7 #include "base/string_util.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/utf_string_conversions.h"

9 #include "chrome/browser/browser_list.h"	9 #include "chrome/browser/browser_list.h"

10 #include "chrome/browser/browser_thread.h"	10 #include "chrome/browser/browser_thread.h"

11 #include "chrome/browser/dom_operation_notification_details.h"	11 #include "chrome/browser/dom_operation_notification_details.h"

12 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"	12 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"

13 #include "chrome/browser/geolocation/geolocation_settings_state.h"	13 #include "chrome/browser/geolocation/geolocation_settings_state.h"

14 #include "chrome/browser/geolocation/location_arbitrator.h"	14 #include "chrome/browser/geolocation/location_arbitrator.h"

15 #include "chrome/browser/geolocation/mock_location_provider.h"	15 #include "chrome/browser/geolocation/mock_location_provider.h"

16 #include "chrome/browser/profile.h"	16 #include "chrome/browser/profiles/profile.h"

17 #include "chrome/browser/renderer_host/render_view_host.h"	17 #include "chrome/browser/renderer_host/render_view_host.h"

18 #include "chrome/browser/tab_contents/infobar_delegate.h"	18 #include "chrome/browser/tab_contents/infobar_delegate.h"

19 #include "chrome/browser/tab_contents/tab_contents.h"	19 #include "chrome/browser/tab_contents/tab_contents.h"

20 #include "chrome/browser/ui/browser.h"	20 #include "chrome/browser/ui/browser.h"

21 #include "chrome/common/chrome_paths.h"	21 #include "chrome/common/chrome_paths.h"

22 #include "chrome/common/geoposition.h"	22 #include "chrome/common/geoposition.h"

23 #include "chrome/common/notification_details.h"	23 #include "chrome/common/notification_details.h"

24 #include "chrome/common/notification_service.h"	24 #include "chrome/common/notification_service.h"

25 #include "chrome/common/notification_type.h"	25 #include "chrome/common/notification_type.h"

26 #include "chrome/test/in_process_browser_test.h"	26 #include "chrome/test/in_process_browser_test.h"

(...skipping 566 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
593 AddGeolocationWatch(true);	593 AddGeolocationWatch(true);

594 SetInfobarResponse(current_url_, true);	594 SetInfobarResponse(current_url_, true);

595 CheckGeoposition(MockLocationProvider::instance_->position_);	595 CheckGeoposition(MockLocationProvider::instance_->position_);

596	596

597 // The second watch will now have cancelled. Ensure an update still makes	597 // The second watch will now have cancelled. Ensure an update still makes

598 // its way through to the first watcher.	598 // its way through to the first watcher.

599 NotifyGeoposition(final_position);	599 NotifyGeoposition(final_position);

600 WaitForNavigation();	600 WaitForNavigation();

601 CheckGeoposition(final_position);	601 CheckGeoposition(final_position);

602 }	602 }

OLD	NEW