Reviewed by ncarter: See http://codereview.chromium.org/2838042/show

=================================================

This changelist includes some minor fixes suggested during a C++ readability review. There are no code logic changes -- all edits are cosmetic.

Review URL on Rietveld code review tool: http://codereview.appspot.com/1737041/show
Buganizer URL for readability review: http://b/issue?id=2786642

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/2840034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51623 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 17 insertions, 17 deletions

diff --git a/chrome/test/live_sync/live_sync_test.cc b/chrome/test/live_sync/live_sync_test.cc
index 997a9b1..a7ccacb 100644
--- a/chrome/test/live_sync/live_sync_test.cc
+++ b/chrome/test/live_sync/live_sync_test.cc
@@ -48,8 +48,7 @@ void LiveSyncTest::TearDown() {
 }
 
 // static
-Profile* LiveSyncTest::MakeProfile(
-    const FilePath::StringType name) {
+Profile* LiveSyncTest::MakeProfile(const FilePath::StringType name) {
   FilePath path;
   PathService::Get(chrome::DIR_USER_DATA, &path);
   return ProfileManager::CreateProfile(path.Append(name));
diff --git a/chrome/test/live_sync/live_sync_test.h b/chrome/test/live_sync/live_sync_test.h
index 71dbbdc..f51369e 100644
--- a/chrome/test/live_sync/live_sync_test.h
+++ b/chrome/test/live_sync/live_sync_test.h
@@ -7,6 +7,8 @@
 
 #include "chrome/test/in_process_browser_test.h"
 
+#include "base/basictypes.h"
+#include "base/scoped_ptr.h"
 #include "base/scoped_vector.h"
 #include "chrome/test/live_sync/profile_sync_service_test_harness.h"
 #include "net/base/mock_host_resolver.h"
@@ -14,18 +16,13 @@
 
 #include <string>
 
-class Profile;
 class CommandLine;
+class Profile;
 
 namespace net {
 class ScopedDefaultHostResolverProc;
 }
 
-namespace switches {
-extern const wchar_t kSyncUserForTest[];
-extern const wchar_t kSyncPasswordForTest[];
-}
-
 // Live sync tests are allowed to run for up to 5 minutes.
 const int kTestTimeoutInMS = 300000;
 
@@ -44,8 +41,9 @@ class LiveSyncTest : public InProcessBrowserTest {
     // functionality level tests.
     TWO_CLIENT,
 
-    // Tests where three client profiles are synced with the server. Typically,
-    // these tests create client side races and verify that sync works.
+    // Tests where three or more client profiles are synced with the server.
+    // Typically, these tests create client side races and verify that sync
+    // works.
     MULTIPLE_CLIENT,
 
     // Tests where several client profiles are synced with the server. Only used
@@ -89,22 +87,22 @@ class LiveSyncTest : public InProcessBrowserTest {
   // Brings down local python test server if one was created.
   virtual void TearDown();
 
-  // Append command line flag to enable sync.
+  // Appends command line flag to enable sync.
   virtual void SetUpCommandLine(CommandLine* command_line) {}
 
-  // Helper to ProfileManager::CreateProfile that handles path creation.
-  static Profile* MakeProfile(const FilePath::StringType name);
-
   // Used to get the number of sync clients used by a test.
   int num_clients() { return num_clients_; }
 
-  // Used to access a particular sync profile.
+  // Returns a pointer to a particular sync profile. Callee owns the object
+  // and manages its lifetime.
   Profile* GetProfile(int index);
 
-  // Used to access a particular sync client.
+  // Returns a pointer to a particular sync client. Callee owns the object
+  // and manages its lifetime.
   ProfileSyncServiceTestHarness* GetClient(int index);
 
-  // Used to verify changes to individual sync profiles.
+  // Returns a pointer to the sync profile that is used to verify changes to
+  // individual sync profiles. Callee owns the object and manages its lifetime.
   Profile* verifier();
 
   // Initializes sync clients and profiles but does not sync any of them.
@@ -133,6 +131,9 @@ class LiveSyncTest : public InProcessBrowserTest {
   std::string password_;
 
  private:
+  // Helper to ProfileManager::CreateProfile that handles path creation.
+  static Profile* MakeProfile(const FilePath::StringType name);
+
   // Helper method used to create a local python test server.
   virtual void SetUpLocalTestServer();