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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/notifications/notifications_apitest.cc

Issue 16295003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/api/notifications/notifications_api.cc ('k') | chrome/browser/extensions/api/permissions/permissions_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/notifications/notifications_apitest.cc
diff --git a/chrome/browser/extensions/api/notifications/notifications_apitest.cc b/chrome/browser/extensions/api/notifications/notifications_apitest.cc
index bf145fc4ab7d4b6ec77cb7fd730af4bccb9609e5..01d7c9d6141fe47f91f6bbc616707704c34fe5c0 100644
--- a/chrome/browser/extensions/api/notifications/notifications_apitest.cc
+++ b/chrome/browser/extensions/api/notifications/notifications_apitest.cc
@@ -70,7 +70,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestIdUsage) {
notification_function->set_has_callback(true);
scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
- notification_function,
+ notification_function.get(),
"[\"\", " // Empty string: ask API to generate ID
"{"
"\"type\": \"basic\","
@@ -78,7 +78,8 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestIdUsage) {
"\"title\": \"Attention!\","
"\"message\": \"Check out Cirque du Soleil\""
"}]",
- browser(), utils::NONE));
+ browser(),
+ utils::NONE));
ASSERT_EQ(base::Value::TYPE_STRING, result->GetType());
ASSERT_TRUE(result->GetAsString(&notification_id));
@@ -95,15 +96,17 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestIdUsage) {
notification_function->set_has_callback(true);
scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
- notification_function,
- "[\"" + notification_id + "\", "
- "{"
- "\"type\": \"basic\","
- "\"iconUrl\": \"an/image/that/does/not/exist.png\","
- "\"title\": \"Attention!\","
- "\"message\": \"Too late! The show ended yesterday\""
- "}]",
- browser(), utils::NONE));
+ notification_function.get(),
+ "[\"" + notification_id +
+ "\", "
+ "{"
+ "\"type\": \"basic\","
+ "\"iconUrl\": \"an/image/that/does/not/exist.png\","
+ "\"title\": \"Attention!\","
+ "\"message\": \"Too late! The show ended yesterday\""
+ "}]",
+ browser(),
+ utils::NONE));
ASSERT_EQ(base::Value::TYPE_BOOLEAN, result->GetType());
bool copy_bool_value = false;
@@ -127,7 +130,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestIdUsage) {
notification_function->set_has_callback(true);
scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
- notification_function,
+ notification_function.get(),
"[\"xxxxxxxxxxxx\", "
"{"
"\"type\": \"basic\","
@@ -135,7 +138,8 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestIdUsage) {
"\"title\": \"!\","
"\"message\": \"!\""
"}]",
- browser(), utils::NONE));
+ browser(),
+ utils::NONE));
ASSERT_EQ(base::Value::TYPE_BOOLEAN, result->GetType());
bool copy_bool_value = false;
@@ -152,9 +156,11 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestIdUsage) {
notification_function->set_extension(empty_extension.get());
notification_function->set_has_callback(true);
- scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
- notification_function,
- "[\"xxxxxxxxxxx\"]", browser(), utils::NONE));
+ scoped_ptr<base::Value> result(
+ utils::RunFunctionAndReturnSingleResult(notification_function.get(),
+ "[\"xxxxxxxxxxx\"]",
+ browser(),
+ utils::NONE));
ASSERT_EQ(base::Value::TYPE_BOOLEAN, result->GetType());
bool copy_bool_value = false;
@@ -171,9 +177,11 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestIdUsage) {
notification_function->set_extension(empty_extension.get());
notification_function->set_has_callback(true);
- scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
- notification_function,
- "[\"" + notification_id + "\"]", browser(), utils::NONE));
+ scoped_ptr<base::Value> result(
+ utils::RunFunctionAndReturnSingleResult(notification_function.get(),
+ "[\"" + notification_id + "\"]",
+ browser(),
+ utils::NONE));
ASSERT_EQ(base::Value::TYPE_BOOLEAN, result->GetType());
bool copy_bool_value = false;
@@ -192,7 +200,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestBaseFormatNotification) {
notification_create_function->set_has_callback(true);
scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
- notification_create_function,
+ notification_create_function.get(),
"[\"\", "
"{"
"\"type\": \"basic\","
@@ -213,7 +221,8 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestBaseFormatNotification) {
"\"expandedMessage\": \"This is a longer expanded message.\","
"\"imageUrl\": \"http://www.google.com/logos/2012/election12-hp.jpg\""
"}]",
- browser(), utils::NONE));
+ browser(),
+ utils::NONE));
std::string notification_id;
ASSERT_EQ(base::Value::TYPE_STRING, result->GetType());
@@ -231,7 +240,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestMultipleItemNotification) {
notification_create_function->set_has_callback(true);
scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
- notification_create_function,
+ notification_create_function.get(),
"[\"\", "
"{"
"\"type\": \"list\","
@@ -253,7 +262,8 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestMultipleItemNotification) {
"\"priority\": 1,"
"\"eventTime\": 1361488019.9999999"
"}]",
- browser(), utils::NONE));
+ browser(),
+ utils::NONE));
// TODO(dharcourt): [...], items = [{title: foo, message: bar}, ...], [...]
std::string notification_id;
@@ -278,7 +288,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, MAYBE_TestGetAll) {
notification_get_all_function->set_extension(empty_extension.get());
notification_get_all_function->set_has_callback(true);
scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
- notification_get_all_function, "[]", browser(), utils::NONE));
+ notification_get_all_function.get(), "[]", browser(), utils::NONE));
base::DictionaryValue* return_value;
ASSERT_EQ(base::Value::TYPE_DICTIONARY, result->GetType());
@@ -297,7 +307,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, MAYBE_TestGetAll) {
notification_create_function->set_has_callback(true);
scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
- notification_create_function,
+ notification_create_function.get(),
base::StringPrintf("[\"identifier-%u\", "
"{"
"\"type\": \"basic\","
@@ -319,7 +329,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, MAYBE_TestGetAll) {
notification_get_all_function->set_extension(empty_extension.get());
notification_get_all_function->set_has_callback(true);
scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
- notification_get_all_function, "[]", browser(), utils::NONE));
+ notification_get_all_function.get(), "[]", browser(), utils::NONE));
base::DictionaryValue* return_value;
ASSERT_EQ(base::Value::TYPE_DICTIONARY, result->GetType());
« no previous file with comments | « chrome/browser/extensions/api/notifications/notifications_api.cc ('k') | chrome/browser/extensions/api/permissions/permissions_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698