commit 2176a88f197d802924d2a83d368e3efab7a6be4b
author Chris Masone <cmasone@chromium.org> Wed Sep 14 22:29:15 2011 -0700
committer Chris Masone <cmasone@chromium.org> Thu Sep 15 10:26:29 2011 -0700
tree 9dc47309952bb163d993d273f2b56a90f5a8e7b9
parent 9d779936d8f8c2d74b30883e2a2622c4207fe797

[shill] Get rid of protected data members in PropertyStoreTest

BUG=chromium-os:19573
TEST=unit
STATUS=Verified

Change-Id: Ib3a2f19abb8cc4aa0e8410fc26bbb60891e35da7
Reviewed-on: http://gerrit.chromium.org/gerrit/7762
Tested-by: Chris Masone <cmasone@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>

profile_unittest.cc

diff --git a/profile_unittest.cc b/profile_unittest.cc
index d0643a2..fe4bc41 100644
--- a/profile_unittest.cc
+++ b/profile_unittest.cc
@@ -28,12 +28,12 @@
 class ProfileTest : public PropertyStoreTest {
  public:
   ProfileTest()
-      : profile_(new MockProfile(&control_interface_, manager(), "")) {
+      : profile_(new MockProfile(control_interface(), manager(), "")) {
   }
 
   MockService *CreateMockService() {
-    return new StrictMock<MockService>(&control_interface_,
-                                       &dispatcher_,
+    return new StrictMock<MockService>(control_interface(),
+                                       dispatcher(),
                                        manager());
   }
 
@@ -90,10 +90,10 @@
   Profile::Identifier id;
   id.identifier = kIdentifier;
   ProfileRefPtr profile(
-      new Profile(&control_interface_, manager(), id, "", false));
+      new Profile(control_interface(), manager(), id, "", false));
   EXPECT_EQ(kIdentifier, profile->GetFriendlyName());
   id.user = kUser;
-  profile = new Profile(&control_interface_, manager(), id, "", false);
+  profile = new Profile(control_interface(), manager(), id, "", false);
   EXPECT_EQ(string(kUser) + "/" + kIdentifier, profile->GetFriendlyName());
 }
 
@@ -105,11 +105,11 @@
   Profile::Identifier id;
   id.identifier = kIdentifier;
   ProfileRefPtr profile(
-      new Profile(&control_interface_, manager(), id, "", false));
+      new Profile(control_interface(), manager(), id, "", false));
   EXPECT_FALSE(profile->GetStoragePath(&path));
   id.user = kUser;
   profile =
-      new Profile(&control_interface_, manager(), id, kFormat, false);
+      new Profile(control_interface(), manager(), id, kFormat, false);
   EXPECT_TRUE(profile->GetStoragePath(&path));
   string suffix = base::StringPrintf("/%s.profile", kIdentifier);
   EXPECT_EQ(base::StringPrintf(kFormat, kUser) + suffix, path.value());
@@ -154,12 +154,12 @@
 
 TEST_F(ProfileTest, EntryEnumeration) {
   scoped_refptr<MockService> service1(
-      new StrictMock<MockService>(&control_interface_,
-                                  &dispatcher_,
+      new StrictMock<MockService>(control_interface(),
+                                  dispatcher(),
                                   manager()));
   scoped_refptr<MockService> service2(
-      new StrictMock<MockService>(&control_interface_,
-                                  &dispatcher_,
+      new StrictMock<MockService>(control_interface(),
+                                  dispatcher(),
                                   manager()));
   string service1_name(service1->UniqueName());
   string service2_name(service2->UniqueName());