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

chrome/browser/sync/sync_setup_flow.h

Index: chrome/browser/sync/sync_setup_flow.h
diff --git a/chrome/browser/sync/sync_setup_flow.h b/chrome/browser/sync/sync_setup_flow.h
index 73b574cba69ec19f2fcdf87a22296a6a31101787..afc3f1405c937d1d6c1928cd4dfec384e6eb8740 100644
--- a/chrome/browser/sync/sync_setup_flow.h
+++ b/chrome/browser/sync/sync_setup_flow.h
@@ -61,12 +61,6 @@ class SyncSetupFlow {
       ProfileSyncService* service,
       DictionaryValue* args);
 
-  // Fills |args| for the enter passphrase screen.
-  static void GetArgsForEnterPassphrase(
-      bool tried_creating_explicit_passphrase,
-      bool tried_setting_explicit_passphrase,
-      DictionaryValue* args);
-
   void AttachSyncSetupHandler(SyncSetupFlowHandler* handler);
 
   // Triggers a state machine transition to advance_state.
@@ -106,6 +100,7 @@ class SyncSetupFlow {
   FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest,
                            DiscreteRunChooseDataTypesAbortedByPendingClear);
   FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, EnterPassphraseRequired);
+  FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, NonFatalError);
 
   // Use static Run method to get an instance.
   SyncSetupFlow(SyncSetupWizard::State start_state,