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

Side by Side Diff: chrome/browser/extensions/api/notifications/notifications_apitest.cc

Issue 2539363004: Make base::Value::TYPE a scoped enum. (Closed)
Patch Set: Rebase Created 4 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
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 "base/strings/string_number_conversions.h" 5 #include "base/strings/string_number_conversions.h"
6 #include "base/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "base/test/scoped_feature_list.h" 8 #include "base/test/scoped_feature_list.h"
9 #include "chrome/browser/apps/app_browsertest_util.h" 9 #include "chrome/browser/apps/app_browsertest_util.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 scoped_refptr<extensions::NotificationsGetPermissionLevelFunction> 271 scoped_refptr<extensions::NotificationsGetPermissionLevelFunction>
272 notification_function( 272 notification_function(
273 new extensions::NotificationsGetPermissionLevelFunction()); 273 new extensions::NotificationsGetPermissionLevelFunction());
274 274
275 notification_function->set_extension(empty_extension.get()); 275 notification_function->set_extension(empty_extension.get());
276 notification_function->set_has_callback(true); 276 notification_function->set_has_callback(true);
277 277
278 std::unique_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult( 278 std::unique_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
279 notification_function.get(), "[]", browser(), utils::NONE)); 279 notification_function.get(), "[]", browser(), utils::NONE));
280 280
281 EXPECT_EQ(base::Value::TYPE_STRING, result->GetType()); 281 EXPECT_EQ(base::Value::Type::STRING, result->GetType());
282 std::string permission_level; 282 std::string permission_level;
283 EXPECT_TRUE(result->GetAsString(&permission_level)); 283 EXPECT_TRUE(result->GetAsString(&permission_level));
284 EXPECT_EQ("granted", permission_level); 284 EXPECT_EQ("granted", permission_level);
285 } 285 }
286 286
287 // Get permission level for the extension whose notifications are disabled. 287 // Get permission level for the extension whose notifications are disabled.
288 { 288 {
289 scoped_refptr<extensions::NotificationsGetPermissionLevelFunction> 289 scoped_refptr<extensions::NotificationsGetPermissionLevelFunction>
290 notification_function( 290 notification_function(
291 new extensions::NotificationsGetPermissionLevelFunction()); 291 new extensions::NotificationsGetPermissionLevelFunction());
292 292
293 notification_function->set_extension(empty_extension.get()); 293 notification_function->set_extension(empty_extension.get());
294 notification_function->set_has_callback(true); 294 notification_function->set_has_callback(true);
295 295
296 message_center::NotifierId notifier_id( 296 message_center::NotifierId notifier_id(
297 message_center::NotifierId::APPLICATION, 297 message_center::NotifierId::APPLICATION,
298 empty_extension->id()); 298 empty_extension->id());
299 message_center::Notifier notifier(notifier_id, base::string16(), true); 299 message_center::Notifier notifier(notifier_id, base::string16(), true);
300 g_browser_process->message_center()->GetNotifierSettingsProvider()-> 300 g_browser_process->message_center()->GetNotifierSettingsProvider()->
301 SetNotifierEnabled(notifier, false); 301 SetNotifierEnabled(notifier, false);
302 302
303 std::unique_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult( 303 std::unique_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
304 notification_function.get(), "[]", browser(), utils::NONE)); 304 notification_function.get(), "[]", browser(), utils::NONE));
305 305
306 EXPECT_EQ(base::Value::TYPE_STRING, result->GetType()); 306 EXPECT_EQ(base::Value::Type::STRING, result->GetType());
307 std::string permission_level; 307 std::string permission_level;
308 EXPECT_TRUE(result->GetAsString(&permission_level)); 308 EXPECT_TRUE(result->GetAsString(&permission_level));
309 EXPECT_EQ("denied", permission_level); 309 EXPECT_EQ("denied", permission_level);
310 } 310 }
311 } 311 }
312 312
313 IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestOnPermissionLevelChanged) { 313 IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestOnPermissionLevelChanged) {
314 const extensions::Extension* extension = 314 const extensions::Extension* extension =
315 LoadExtensionAndWait("notifications/api/permission"); 315 LoadExtensionAndWait("notifications/api/permission");
316 ASSERT_TRUE(extension) << message_; 316 ASSERT_TRUE(extension) << message_;
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 516
517 ASSERT_TRUE(GetFirstAppWindow(extension->id())->IsFullscreen()) 517 ASSERT_TRUE(GetFirstAppWindow(extension->id())->IsFullscreen())
518 << "Not Fullscreen"; 518 << "Not Fullscreen";
519 ASSERT_TRUE(GetFirstAppWindow(extension->id())->GetBaseWindow()->IsActive()) 519 ASSERT_TRUE(GetFirstAppWindow(extension->id())->GetBaseWindow()->IsActive())
520 << "Not Active"; 520 << "Not Active";
521 521
522 const message_center::NotificationList::PopupNotifications notifications = 522 const message_center::NotificationList::PopupNotifications notifications =
523 g_browser_process->message_center()->GetPopupNotifications(); 523 g_browser_process->message_center()->GetPopupNotifications();
524 ASSERT_EQ(1u, notifications.size()); 524 ASSERT_EQ(1u, notifications.size());
525 } 525 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698