summaryrefslogtreecommitdiffstats
path: root/remoting/host/server_log_entry_unittest.cc
diff options
context:
space:
mode:
authorsimonmorris@chromium.org <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-22 19:48:18 +0000
committersimonmorris@chromium.org <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-22 19:48:18 +0000
commit75d4e50d2d199520497a6aa33a8a09d77ddda8aa (patch)
tree82d5e900627286bfa425309ec94d87dff8dc5f29 /remoting/host/server_log_entry_unittest.cc
parentf8a8475db6a0667dbb15fb14cc81e33a506696e2 (diff)
downloadchromium_src-75d4e50d2d199520497a6aa33a8a09d77ddda8aa.zip
chromium_src-75d4e50d2d199520497a6aa33a8a09d77ddda8aa.tar.gz
chromium_src-75d4e50d2d199520497a6aa33a8a09d77ddda8aa.tar.bz2
[Chromoting] Replace some bare pointers with scoped_ptrs, and improve naming.
This is a follow-up to codereview.chromium.org/10409017 BUG=126491 Review URL: https://chromiumcodereview.appspot.com/10399127 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138331 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/server_log_entry_unittest.cc')
-rw-r--r--remoting/host/server_log_entry_unittest.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/remoting/host/server_log_entry_unittest.cc b/remoting/host/server_log_entry_unittest.cc
index 4f1ac2b..2f19106 100644
--- a/remoting/host/server_log_entry_unittest.cc
+++ b/remoting/host/server_log_entry_unittest.cc
@@ -60,9 +60,9 @@ class ServerLogEntryTest : public testing::Test {
}
};
-TEST_F(ServerLogEntryTest, MakeSessionStateChange) {
+TEST_F(ServerLogEntryTest, MakeForSessionStateChange) {
scoped_ptr<ServerLogEntry> entry(
- ServerLogEntry::MakeSessionStateChange(true));
+ ServerLogEntry::MakeForSessionStateChange(true));
scoped_ptr<XmlElement> stanza = entry->ToStanza();
std::string error;
std::map<std::string, std::string> key_value_pairs;
@@ -74,7 +74,7 @@ TEST_F(ServerLogEntryTest, MakeSessionStateChange) {
<< error;
}
-TEST_F(ServerLogEntryTest, MakeHeartbeat) {
+TEST_F(ServerLogEntryTest, MakeForHeartbeat) {
scoped_ptr<ServerLogEntry> entry(ServerLogEntry::MakeForHeartbeat());
scoped_ptr<XmlElement> stanza = entry->ToStanza();
std::string error;
@@ -88,7 +88,7 @@ TEST_F(ServerLogEntryTest, MakeHeartbeat) {
TEST_F(ServerLogEntryTest, AddHostFields) {
scoped_ptr<ServerLogEntry> entry(
- ServerLogEntry::MakeSessionStateChange(true));
+ ServerLogEntry::MakeForSessionStateChange(true));
entry->AddHostFields();
scoped_ptr<XmlElement> stanza = entry->ToStanza();
std::string error;
@@ -116,7 +116,7 @@ TEST_F(ServerLogEntryTest, AddHostFields) {
TEST_F(ServerLogEntryTest, AddModeField1) {
scoped_ptr<ServerLogEntry> entry(
- ServerLogEntry::MakeSessionStateChange(true));
+ ServerLogEntry::MakeForSessionStateChange(true));
entry->AddModeField(ServerLogEntry::IT2ME);
scoped_ptr<XmlElement> stanza = entry->ToStanza();
std::string error;
@@ -132,7 +132,7 @@ TEST_F(ServerLogEntryTest, AddModeField1) {
TEST_F(ServerLogEntryTest, AddModeField2) {
scoped_ptr<ServerLogEntry> entry(
- ServerLogEntry::MakeSessionStateChange(true));
+ ServerLogEntry::MakeForSessionStateChange(true));
entry->AddModeField(ServerLogEntry::ME2ME);
scoped_ptr<XmlElement> stanza = entry->ToStanza();
std::string error;