Revert 51595 - Incorporating feedback from C++ readability review....

chrome/test/live_sync/live_sync_test.h

Index: chrome/test/live_sync/live_sync_test.h
===================================================================
--- chrome/test/live_sync/live_sync_test.h	(revision 51595)
+++ chrome/test/live_sync/live_sync_test.h	(working copy)
@@ -7,8 +7,6 @@
 
 #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"
@@ -16,13 +14,18 @@
 
 #include <string>
 
-class CommandLine;
 class Profile;
+class CommandLine;
 
 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;
 
@@ -41,9 +44,8 @@
     // functionality level tests.
     TWO_CLIENT,
 
-    // Tests where three or more client profiles are synced with the server.
-    // Typically, these tests create client side races and verify that sync
-    // works.
+    // Tests where three 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
@@ -87,22 +89,22 @@
   // Brings down local python test server if one was created.
   virtual void TearDown();
 
-  // Appends command line flag to enable sync.
+  // Append 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_; }
 
-  // Returns a pointer to a particular sync profile. Callee owns the object
-  // and manages its lifetime.
+  // Used to access a particular sync profile.
   Profile* GetProfile(int index);
 
-  // Returns a pointer to a particular sync client. Callee owns the object
-  // and manages its lifetime.
+  // Used to access a particular sync client.
   ProfileSyncServiceTestHarness* GetClient(int index);
 
-  // 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.
+  // Used to verify changes to individual sync profiles.
   Profile* verifier();
 
   // Initializes sync clients and profiles but does not sync any of them.
@@ -131,9 +133,6 @@
   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();