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

Side by Side Diff: chrome/browser/notifications/notification_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/notifications/desktop_notification_profile_util.cc ('k') | chrome/browser/policy/policy_browsertest.cc » ('j') | no next file with comments »

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 <deque>	5 #include <deque>

6 #include <string>	6 #include <string>

7	7

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

9 #include "base/callback.h"	9 #include "base/callback.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "base/compiler_specific.h"	11 #include "base/compiler_specific.h"

12 #include "base/memory/ref_counted.h"	12 #include "base/memory/ref_counted.h"

13 #include "base/run_loop.h"	13 #include "base/run_loop.h"

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

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

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

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

18 #include "chrome/browser/browser_process.h"	18 #include "chrome/browser/browser_process.h"

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

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

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

22 #include "chrome/browser/notifications/desktop_notification_profile_util.h"	22 #include "chrome/browser/notifications/desktop_notification_profile_util.h"

23 #include "chrome/browser/notifications/notification.h"	23 #include "chrome/browser/notifications/notification.h"

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

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

26 #include "chrome/browser/ui/browser_tabstrip.h"	26 #include "chrome/browser/ui/browser_tabstrip.h"

27 #include "chrome/browser/ui/browser_window.h"	27 #include "chrome/browser/ui/browser_window.h"

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

29 #include "chrome/common/content_settings.h"	29 #include "chrome/common/content_settings.h"

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

31 #include "chrome/test/base/in_process_browser_test.h"	30 #include "chrome/test/base/in_process_browser_test.h"

32 #include "chrome/test/base/ui_test_utils.h"	31 #include "chrome/test/base/ui_test_utils.h"

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

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

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

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

36 #include "content/public/browser/notification_source.h"	36 #include "content/public/browser/notification_source.h"

37 #include "content/public/browser/notification_types.h"	37 #include "content/public/browser/notification_types.h"

38 #include "content/public/browser/render_view_host.h"	38 #include "content/public/browser/render_view_host.h"

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

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

41 #include "content/public/test/test_utils.h"	41 #include "content/public/test/test_utils.h"

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

(...skipping 789 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
832 (*notifications.rbegin())->id());	832 (*notifications.rbegin())->id());

833	833

834 ASSERT_EQ(0, GetNotificationPopupCount());	834 ASSERT_EQ(0, GetNotificationPopupCount());

835	835

836 result = CreateNotification(	836 result = CreateNotification(

837 browser(), true, "abc.png", "Title2", "Body2", "chat");	837 browser(), true, "abc.png", "Title2", "Body2", "chat");

838 EXPECT_NE("-1", result);	838 EXPECT_NE("-1", result);

839	839

840 ASSERT_EQ(1, GetNotificationPopupCount());	840 ASSERT_EQ(1, GetNotificationPopupCount());

841 }	841 }

OLD	NEW