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

chrome/browser/sync/sync_setup_flow.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_
 #define CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 43 matching lines @@
   // Fills |args| with "user" and "error" arguments by querying |service|.
   static void GetArgsForGaiaLogin(
       const ProfileSyncService* service,
       DictionaryValue* args);
 
   // Fills |args| for the configure screen (Choose Data Types/Encryption)
   static void GetArgsForConfigure(
       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.
   void Advance(SyncSetupWizard::State advance_state);
 
   // Focuses the dialog.  This is useful in cases where the dialog has been
   // obscured by a browser window.
   void Focus();
 
   void OnUserSubmittedAuth(const std::string& username,
@@ skipping 19 matching lines @@
   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);
+  FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, NonFatalError);
 
   // Use static Run method to get an instance.
   SyncSetupFlow(SyncSetupWizard::State start_state,
                 SyncSetupWizard::State end_state,
                 const std::string& args,
                 SyncSetupFlowContainer* container,
                 ProfileSyncService* service);
 
   // Returns true if |this| should transition its state machine to |state|
   // based on |current_state_|, or false if that would be nonsense or is
@@ skipping 37 matching lines @@
   }
 
   SyncSetupFlow* get_flow() { return flow_; }
  private:
   SyncSetupFlow* flow_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncSetupFlowContainer);
 };
 
 #endif  // CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_