chrome/browser/geolocation/geolocation_browsertest.cc - Issue 518803009: Move content_settings_pattern and content_settings_pattern_parser to the content_settings component.

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

Issue 518803009: Move content_settings_pattern and content_settings_pattern_parser to the content_settings component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 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

« no previous file with comments | « chrome/browser/extensions/api/content_settings/content_settings_store.h ('k') | chrome/browser/media/media_stream_device_permissions.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

9 #include "base/strings/stringprintf.h"	9 #include "base/strings/stringprintf.h"

10 #include "base/strings/utf_string_conversions.h"	10 #include "base/strings/utf_string_conversions.h"

11 #include "base/test/simple_test_clock.h"	11 #include "base/test/simple_test_clock.h"

12 #include "base/time/clock.h"	12 #include "base/time/clock.h"

13 #include "chrome/browser/chrome_notification_types.h"	13 #include "chrome/browser/chrome_notification_types.h"

14 #include "chrome/browser/content_settings/content_settings_usages_state.h"	14 #include "chrome/browser/content_settings/content_settings_usages_state.h"

15 #include "chrome/browser/content_settings/host_content_settings_map.h"	15 #include "chrome/browser/content_settings/host_content_settings_map.h"

16 #include "chrome/browser/content_settings/tab_specific_content_settings.h"	16 #include "chrome/browser/content_settings/tab_specific_content_settings.h"

17 #include "chrome/browser/infobars/infobar_service.h"	17 #include "chrome/browser/infobars/infobar_service.h"

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

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

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

21 #include "chrome/browser/ui/tabs/tab_strip_model.h"	21 #include "chrome/browser/ui/tabs/tab_strip_model.h"

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

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

24 #include "chrome/test/base/in_process_browser_test.h"	23 #include "chrome/test/base/in_process_browser_test.h"

25 #include "chrome/test/base/ui_test_utils.h"	24 #include "chrome/test/base/ui_test_utils.h"

	25 #include "components/content_settings/core/common/content_settings_pattern.h"

26 #include "components/infobars/core/confirm_infobar_delegate.h"	26 #include "components/infobars/core/confirm_infobar_delegate.h"

27 #include "components/infobars/core/infobar.h"	27 #include "components/infobars/core/infobar.h"

28 #include "content/public/browser/dom_operation_notification_details.h"	28 #include "content/public/browser/dom_operation_notification_details.h"

29 #include "content/public/browser/navigation_controller.h"	29 #include "content/public/browser/navigation_controller.h"

30 #include "content/public/browser/notification_details.h"	30 #include "content/public/browser/notification_details.h"

31 #include "content/public/browser/notification_service.h"	31 #include "content/public/browser/notification_service.h"

32 #include "content/public/browser/render_frame_host.h"	32 #include "content/public/browser/render_frame_host.h"

33 #include "content/public/browser/web_contents.h"	33 #include "content/public/browser/web_contents.h"

34 #include "content/public/test/browser_test_utils.h"	34 #include "content/public/test/browser_test_utils.h"

35 #include "net/base/net_util.h"	35 #include "net/base/net_util.h"

(...skipping 773 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
809 // Last usage has been updated.	809 // Last usage has been updated.

810 EXPECT_EQ(current_browser()	810 EXPECT_EQ(current_browser()

811 ->profile()	811 ->profile()

812 ->GetHostContentSettingsMap()	812 ->GetHostContentSettingsMap()

813 ->GetLastUsage(current_url().GetOrigin(),	813 ->GetLastUsage(current_url().GetOrigin(),

814 current_url().GetOrigin(),	814 current_url().GetOrigin(),

815 CONTENT_SETTINGS_TYPE_GEOLOCATION)	815 CONTENT_SETTINGS_TYPE_GEOLOCATION)

816 .ToDoubleT(),	816 .ToDoubleT(),

817 13);	817 13);

818 }	818 }

OLD	NEW