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

Side by Side Diff: chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc

Issue 2777063003: Stop passing raw pointers to base::Value API in c/b/chromeos and c/b/extensions (Closed)
Patch Set: Fix SupervisedUserWhitelistInstaller Created 3 years, 8 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/extensions/api/activity_log_private/activity_log_privat e_api.h" 5 #include "chrome/browser/extensions/api/activity_log_private/activity_log_privat e_api.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/memory/ptr_util.h"
11 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
jdoerrie 2017/04/06 14:25:50 #include "base/values.h"
vabr (Chromium) 2017/04/07 20:40:39 Done.
12 #include "chrome/browser/extensions/activity_log/activity_action_constants.h" 13 #include "chrome/browser/extensions/activity_log/activity_action_constants.h"
13 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
14 15
15 namespace { 16 namespace {
16 17
17 const char kExtensionId[] = "extensionid"; 18 const char kExtensionId[] = "extensionid";
18 const char kApiCall[] = "api.call"; 19 const char kApiCall[] = "api.call";
19 const char kArgs[] = "[\"hello\",\"world\"]"; 20 const char kArgs[] = "[\"hello\",\"world\"]";
20 21
21 } // extensions 22 } // extensions
22 23
23 namespace extensions { 24 namespace extensions {
24 25
25 using api::activity_log_private::ExtensionActivity; 26 using api::activity_log_private::ExtensionActivity;
26 27
27 typedef testing::Test ActivityLogApiUnitTest; 28 typedef testing::Test ActivityLogApiUnitTest;
28 29
29 TEST_F(ActivityLogApiUnitTest, ConvertChromeApiAction) { 30 TEST_F(ActivityLogApiUnitTest, ConvertChromeApiAction) {
30 std::unique_ptr<base::ListValue> args(new base::ListValue()); 31 std::unique_ptr<base::ListValue> args(new base::ListValue());
31 args->Set(0, new base::Value("hello")); 32 args->Set(0, base::MakeUnique<base::Value>("hello"));
32 args->Set(1, new base::Value("world")); 33 args->Set(1, base::MakeUnique<base::Value>("world"));
33 scoped_refptr<Action> action(new Action(kExtensionId, 34 scoped_refptr<Action> action(new Action(kExtensionId,
34 base::Time::Now(), 35 base::Time::Now(),
35 Action::ACTION_API_CALL, 36 Action::ACTION_API_CALL,
36 kApiCall)); 37 kApiCall));
37 action->set_args(std::move(args)); 38 action->set_args(std::move(args));
38 ExtensionActivity result = action->ConvertToExtensionActivity(); 39 ExtensionActivity result = action->ConvertToExtensionActivity();
39 ASSERT_EQ(api::activity_log_private::EXTENSION_ACTIVITY_TYPE_API_CALL, 40 ASSERT_EQ(api::activity_log_private::EXTENSION_ACTIVITY_TYPE_API_CALL,
40 result.activity_type); 41 result.activity_type);
41 ASSERT_EQ(kExtensionId, *(result.extension_id.get())); 42 ASSERT_EQ(kExtensionId, *(result.extension_id.get()));
42 ASSERT_EQ(kApiCall, *(result.api_call.get())); 43 ASSERT_EQ(kApiCall, *(result.api_call.get()));
43 ASSERT_EQ(kArgs, *(result.args.get())); 44 ASSERT_EQ(kArgs, *(result.args.get()));
44 ASSERT_EQ(NULL, result.activity_id.get()); 45 ASSERT_EQ(NULL, result.activity_id.get());
45 } 46 }
46 47
47 TEST_F(ActivityLogApiUnitTest, ConvertDomAction) { 48 TEST_F(ActivityLogApiUnitTest, ConvertDomAction) {
48 std::unique_ptr<base::ListValue> args(new base::ListValue()); 49 std::unique_ptr<base::ListValue> args(new base::ListValue());
49 args->Set(0, new base::Value("hello")); 50 args->Set(0, base::MakeUnique<base::Value>("hello"));
50 args->Set(1, new base::Value("world")); 51 args->Set(1, base::MakeUnique<base::Value>("world"));
51 scoped_refptr<Action> action(new Action(kExtensionId, 52 scoped_refptr<Action> action(new Action(kExtensionId,
52 base::Time::Now(), 53 base::Time::Now(),
53 Action::ACTION_DOM_ACCESS, 54 Action::ACTION_DOM_ACCESS,
54 kApiCall, 55 kApiCall,
55 12345)); 56 12345));
56 action->set_args(std::move(args)); 57 action->set_args(std::move(args));
57 action->set_page_url(GURL("http://www.google.com")); 58 action->set_page_url(GURL("http://www.google.com"));
58 action->set_page_title("Title"); 59 action->set_page_title("Title");
59 action->mutable_other()->SetInteger(activity_log_constants::kActionDomVerb, 60 action->mutable_other()->SetInteger(activity_log_constants::kActionDomVerb,
60 DomActionType::INSERTED); 61 DomActionType::INSERTED);
61 action->mutable_other()->SetBoolean(activity_log_constants::kActionPrerender, 62 action->mutable_other()->SetBoolean(activity_log_constants::kActionPrerender,
62 false); 63 false);
63 ExtensionActivity result = action->ConvertToExtensionActivity(); 64 ExtensionActivity result = action->ConvertToExtensionActivity();
64 ASSERT_EQ(kExtensionId, *(result.extension_id.get())); 65 ASSERT_EQ(kExtensionId, *(result.extension_id.get()));
65 ASSERT_EQ("http://www.google.com/", *(result.page_url.get())); 66 ASSERT_EQ("http://www.google.com/", *(result.page_url.get()));
66 ASSERT_EQ("Title", *(result.page_title.get())); 67 ASSERT_EQ("Title", *(result.page_title.get()));
67 ASSERT_EQ(kApiCall, *(result.api_call.get())); 68 ASSERT_EQ(kApiCall, *(result.api_call.get()));
68 ASSERT_EQ(kArgs, *(result.args.get())); 69 ASSERT_EQ(kArgs, *(result.args.get()));
69 std::unique_ptr<ExtensionActivity::Other> other(std::move(result.other)); 70 std::unique_ptr<ExtensionActivity::Other> other(std::move(result.other));
70 ASSERT_EQ(api::activity_log_private::EXTENSION_ACTIVITY_DOM_VERB_INSERTED, 71 ASSERT_EQ(api::activity_log_private::EXTENSION_ACTIVITY_DOM_VERB_INSERTED,
71 other->dom_verb); 72 other->dom_verb);
72 ASSERT_TRUE(other->prerender.get()); 73 ASSERT_TRUE(other->prerender.get());
73 ASSERT_EQ("12345", *(result.activity_id.get())); 74 ASSERT_EQ("12345", *(result.activity_id.get()));
74 } 75 }
75 76
76 } // namespace extensions 77 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698