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

Side by Side Diff: chrome/browser/task_manager/task_manager_notification_browsertest.cc

Issue 63273002: Rename WebKit namespace to blink (part 4) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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) 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 "chrome/browser/task_manager/task_manager.h" 5 #include "chrome/browser/task_manager/task_manager.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/extensions/extension_browsertest.h" 9 #include "chrome/browser/extensions/extension_browsertest.h"
10 #include "chrome/browser/notifications/desktop_notification_service.h" 10 #include "chrome/browser/notifications/desktop_notification_service.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 chrome::ShowTaskManager(browser()); 56 chrome::ShowTaskManager(browser());
57 // Expect to see the browser and the New Tab Page renderer. 57 // Expect to see the browser and the New Tab Page renderer.
58 TaskManagerBrowserTestUtil::WaitForWebResourceChange(1); 58 TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
59 59
60 // Show a notification. 60 // Show a notification.
61 NotificationUIManager* notifications = 61 NotificationUIManager* notifications =
62 g_browser_process->notification_ui_manager(); 62 g_browser_process->notification_ui_manager();
63 63
64 string16 content = DesktopNotificationService::CreateDataUrl( 64 string16 content = DesktopNotificationService::CreateDataUrl(
65 GURL(), ASCIIToUTF16("Hello World!"), string16(), 65 GURL(), ASCIIToUTF16("Hello World!"), string16(),
66 WebKit::WebTextDirectionDefault); 66 blink::WebTextDirectionDefault);
67 67
68 scoped_refptr<NotificationDelegate> del1(new MockNotificationDelegate("n1")); 68 scoped_refptr<NotificationDelegate> del1(new MockNotificationDelegate("n1"));
69 Notification n1( 69 Notification n1(
70 GURL(), GURL(content), ASCIIToUTF16("Test 1"), string16(), del1.get()); 70 GURL(), GURL(content), ASCIIToUTF16("Test 1"), string16(), del1.get());
71 scoped_refptr<NotificationDelegate> del2(new MockNotificationDelegate("n2")); 71 scoped_refptr<NotificationDelegate> del2(new MockNotificationDelegate("n2"));
72 Notification n2( 72 Notification n2(
73 GURL(), GURL(content), ASCIIToUTF16("Test 2"), string16(), del2.get()); 73 GURL(), GURL(content), ASCIIToUTF16("Test 2"), string16(), del2.get());
74 74
75 notifications->Add(n1, browser()->profile()); 75 notifications->Add(n1, browser()->profile());
76 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2); 76 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2);
77 notifications->Add(n2, browser()->profile()); 77 notifications->Add(n2, browser()->profile());
78 TaskManagerBrowserTestUtil::WaitForWebResourceChange(3); 78 TaskManagerBrowserTestUtil::WaitForWebResourceChange(3);
79 notifications->CancelById(n1.notification_id()); 79 notifications->CancelById(n1.notification_id());
80 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2); 80 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2);
81 notifications->CancelById(n2.notification_id()); 81 notifications->CancelById(n2.notification_id());
82 TaskManagerBrowserTestUtil::WaitForWebResourceChange(1); 82 TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
83 } 83 }
OLDNEW
« no previous file with comments | « chrome/browser/task_manager/task_manager.cc ('k') | chrome/browser/translate/translate_manager_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698