Sync: Refactor the ProfileSyncService and sync setup flow to remove use of WebUI from PSS.

chrome/browser/ui/webui/options/sync_setup_handler.h

Index: chrome/browser/ui/webui/options/sync_setup_handler.h
diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.h b/chrome/browser/ui/webui/options/sync_setup_handler.h
index 1159e1d6a356ee33e8d55bf0db75c90d5427bcbd..6479f4718f28a8677872443a10befefaee6dfda2 100644
--- a/chrome/browser/ui/webui/options/sync_setup_handler.h
+++ b/chrome/browser/ui/webui/options/sync_setup_handler.h
@@ -32,15 +32,31 @@ class SyncSetupHandler : public OptionsPageUIHandler,
 
   virtual void SetFlow(SyncSetupFlow* flow);
 
- private:
-  // Callbacks from the page.
+ protected:
+  FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, InitialStepLogin);
+  FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, ChooseDataTypesSetsPrefs);
+  FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, DialogCancelled);
+  FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, InvalidTransitions);
+  FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, FullSuccessfulRunSetsPref);
+  FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, AbortedByPendingClear);
+  FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, DiscreteRunGaiaLogin);
+  FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, DiscreteRunChooseDataTypes);
+  FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest,
+                           DiscreteRunChooseDataTypesAbortedByPendingClear);
+  FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, EnterPassphraseRequired);
+
+  // Callbacks from the page. Protected in order to be called by the

[binji, 2011/06/13 22:32:52]

finish comment

[James Hawkins, 2011/06/13 23:14:52]

Done.

   void OnDidClosePage(const ListValue* args);
   void HandleSubmitAuth(const ListValue* args);
   void HandleConfigure(const ListValue* args);
   void HandlePassphraseEntry(const ListValue* args);
   void HandlePassphraseCancel(const ListValue* args);
   void HandleAttachHandler(const ListValue* args);
+  void HandleShowErrorUI(const ListValue* args);
 
+  SyncSetupFlow* flow() { return flow_; }
+
+ private:
   // Weak reference.
   SyncSetupFlow* flow_;