Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(812)

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

Issue 7885006: Moving ContentSettingsPattern from chrome/browser/content_settings to chrome/common. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Keeping up to date with trunk. Created 9 years, 3 months 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <string> 5 #include <string>
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/string_number_conversions.h"
8 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
9 #include "base/string_number_conversions.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/content_settings/content_settings_pattern.h"
12 #include "chrome/browser/content_settings/host_content_settings_map.h" 11 #include "chrome/browser/content_settings/host_content_settings_map.h"
13 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 12 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
14 #include "chrome/browser/dom_operation_notification_details.h" 13 #include "chrome/browser/dom_operation_notification_details.h"
15 #include "chrome/browser/geolocation/geolocation_settings_state.h" 14 #include "chrome/browser/geolocation/geolocation_settings_state.h"
16 #include "chrome/browser/infobars/infobar_tab_helper.h" 15 #include "chrome/browser/infobars/infobar_tab_helper.h"
17 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" 17 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
19 #include "chrome/browser/tab_contents/infobar.h" 18 #include "chrome/browser/tab_contents/infobar.h"
20 #include "chrome/browser/ui/browser.h" 19 #include "chrome/browser/ui/browser.h"
21 #include "chrome/browser/ui/browser_list.h" 20 #include "chrome/browser/ui/browser_list.h"
22 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 21 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
23 #include "chrome/common/chrome_notification_types.h" 22 #include "chrome/common/chrome_notification_types.h"
24 #include "chrome/common/chrome_paths.h" 23 #include "chrome/common/chrome_paths.h"
24 #include "chrome/common/content_settings_pattern.h"
25 #include "chrome/test/base/in_process_browser_test.h" 25 #include "chrome/test/base/in_process_browser_test.h"
26 #include "chrome/test/base/ui_test_utils.h" 26 #include "chrome/test/base/ui_test_utils.h"
27 #include "content/browser/geolocation/arbitrator_dependency_factories_for_test.h " 27 #include "content/browser/geolocation/arbitrator_dependency_factories_for_test.h "
28 #include "content/browser/geolocation/location_arbitrator.h" 28 #include "content/browser/geolocation/location_arbitrator.h"
29 #include "content/browser/geolocation/mock_location_provider.h" 29 #include "content/browser/geolocation/mock_location_provider.h"
30 #include "content/browser/renderer_host/render_view_host.h" 30 #include "content/browser/renderer_host/render_view_host.h"
31 #include "content/browser/tab_contents/tab_contents.h" 31 #include "content/browser/tab_contents/tab_contents.h"
32 #include "content/common/geoposition.h" 32 #include "content/common/geoposition.h"
33 #include "content/common/notification_details.h" 33 #include "content/common/notification_details.h"
34 #include "content/common/notification_service.h" 34 #include "content/common/notification_service.h"
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 "window.domAutomationController.setAutomationId(0);" 671 "window.domAutomationController.setAutomationId(0);"
672 "window.domAutomationController.send(window.close());"; 672 "window.domAutomationController.send(window.close());";
673 bool result = 673 bool result =
674 ui_test_utils::ExecuteJavaScript( 674 ui_test_utils::ExecuteJavaScript(
675 current_browser_->GetSelectedTabContents()->render_view_host(), 675 current_browser_->GetSelectedTabContents()->render_view_host(),
676 L"", UTF8ToWide(script)); 676 L"", UTF8ToWide(script));
677 EXPECT_EQ(result, true); 677 EXPECT_EQ(result, true);
678 } 678 }
679 679
680 } // namespace 680 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698