Settings Rewrite: Fork SyncSetupHandler for MD-Settings

chrome/browser/ui/webui/settings/sync_handler.h

Index: chrome/browser/ui/webui/settings/sync_handler.h
diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.h b/chrome/browser/ui/webui/settings/sync_handler.h
similarity index 65%
copy from chrome/browser/ui/webui/options/sync_setup_handler.h
copy to chrome/browser/ui/webui/settings/sync_handler.h
index 0065eccb97f0f482481c2c870fa79894f84f5ea0..8a306267f0e25722c0463945aa72fbf3c8833ff7 100644
--- a/chrome/browser/ui/webui/options/sync_setup_handler.h
+++ b/chrome/browser/ui/webui/settings/sync_handler.h
@@ -1,16 +1,17 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2015 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_UI_WEBUI_OPTIONS_SYNC_SETUP_HANDLER_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS_SYNC_SETUP_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_SETTINGS_SYNC_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_SETTINGS_SYNC_HANDLER_H_
 
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/sync/sync_startup_tracker.h"
-#include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
+#include "content/public/browser/web_ui_message_handler.h"
 
 class LoginUIService;
 class ProfileSyncService;
@@ -18,17 +19,19 @@ class SigninManagerBase;
 
 namespace content {
 class WebContents;
+class WebUI;
 }
 
-class SyncSetupHandler : public options::OptionsPageUIHandler,
-                         public SyncStartupTracker::Observer,
-                         public LoginUIService::LoginUI {
+namespace settings {
+
+class SyncHandler : public content::WebUIMessageHandler,
+                    public SyncStartupTracker::Observer,
+                    public LoginUIService::LoginUI {
  public:
-  SyncSetupHandler();
-  ~SyncSetupHandler() override;
+  SyncHandler();
+  ~SyncHandler() override;
 
-  // OptionsPageUIHandler implementation.
-  void GetLocalizedValues(base::DictionaryValue* localized_strings) override;
+  // content::WebUIMessageHandler implementation.
   void RegisterMessages() override;
 
   // SyncStartupTracker::Observer implementation;
@@ -39,10 +42,6 @@ class SyncSetupHandler : public options::OptionsPageUIHandler,
   void FocusUI() override;
   void CloseUI() override;
 
-  static void GetStaticLocalizedValues(
-      base::DictionaryValue* localized_strings,
-      content::WebUI* web_ui);
-
   // Initializes the sync setup flow and shows the setup UI.
   void OpenSyncSetup();
 
@@ -55,30 +54,30 @@ class SyncSetupHandler : public options::OptionsPageUIHandler,
   void CloseSyncSetup();
 
  protected:
-  friend class SyncSetupHandlerTest;
-  FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerTest,
+  friend class SyncHandlerTest;
+  FRIEND_TEST_ALL_PREFIXES(SyncHandlerTest,
                            DisplayConfigureWithBackendDisabledAndCancel);
-  FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerTest, HandleSetupUIWhenSyncDisabled);
-  FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerTest, SelectCustomEncryption);
-  FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerTest, ShowSyncSetupWhenNotSignedIn);
-  FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerTest, SuccessfullySetPassphrase);
-  FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerTest, TestSyncEverything);
-  FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerTest, TestSyncNothing);
-  FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerTest, TestSyncAllManually);
-  FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerTest, TestPassphraseStillRequired);
-  FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerTest, TestSyncIndividualTypes);
-  FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerTest, TurnOnEncryptAll);
-  FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerTest, TurnOnEncryptAllDisallowed);
-  FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerTest, UnsuccessfullySetPassphrase);
-  FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerNonCrosTest,
+  FRIEND_TEST_ALL_PREFIXES(SyncHandlerTest, HandleSetupUIWhenSyncDisabled);
+  FRIEND_TEST_ALL_PREFIXES(SyncHandlerTest, SelectCustomEncryption);
+  FRIEND_TEST_ALL_PREFIXES(SyncHandlerTest, ShowSyncSetupWhenNotSignedIn);
+  FRIEND_TEST_ALL_PREFIXES(SyncHandlerTest, SuccessfullySetPassphrase);
+  FRIEND_TEST_ALL_PREFIXES(SyncHandlerTest, TestSyncEverything);
+  FRIEND_TEST_ALL_PREFIXES(SyncHandlerTest, TestSyncNothing);
+  FRIEND_TEST_ALL_PREFIXES(SyncHandlerTest, TestSyncAllManually);
+  FRIEND_TEST_ALL_PREFIXES(SyncHandlerTest, TestPassphraseStillRequired);
+  FRIEND_TEST_ALL_PREFIXES(SyncHandlerTest, TestSyncIndividualTypes);
+  FRIEND_TEST_ALL_PREFIXES(SyncHandlerTest, TurnOnEncryptAll);
+  FRIEND_TEST_ALL_PREFIXES(SyncHandlerTest, TurnOnEncryptAllDisallowed);
+  FRIEND_TEST_ALL_PREFIXES(SyncHandlerTest, UnsuccessfullySetPassphrase);
+  FRIEND_TEST_ALL_PREFIXES(SyncHandlerNonCrosTest,
                            UnrecoverableErrorInitializingSync);
-  FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerNonCrosTest,
+  FRIEND_TEST_ALL_PREFIXES(SyncHandlerNonCrosTest,
                            GaiaErrorInitializingSync);
-  FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerNonCrosTest, HandleCaptcha);
-  FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerNonCrosTest, HandleGaiaAuthFailure);
-  FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerNonCrosTest,
+  FRIEND_TEST_ALL_PREFIXES(SyncHandlerNonCrosTest, HandleCaptcha);
+  FRIEND_TEST_ALL_PREFIXES(SyncHandlerNonCrosTest, HandleGaiaAuthFailure);
+  FRIEND_TEST_ALL_PREFIXES(SyncHandlerNonCrosTest,
                            SubmitAuthWithInvalidUsername);
-  FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerFirstSigninTest, DisplayBasicLogin);
+  FRIEND_TEST_ALL_PREFIXES(SyncHandlerFirstSigninTest, DisplayBasicLogin);
 
   bool is_configuring_sync() const { return configuring_sync_; }
 
@@ -154,7 +153,9 @@ class SyncSetupHandler : public options::OptionsPageUIHandler,
   // service.
   scoped_ptr<base::OneShotTimer> backend_start_timer_;
 
-  DISALLOW_COPY_AND_ASSIGN(SyncSetupHandler);
+  DISALLOW_COPY_AND_ASSIGN(SyncHandler);
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_SYNC_SETUP_HANDLER_H_
+}  // namespace settings
+
+#endif  // CHROME_BROWSER_UI_WEBUI_SETTINGS_SYNC_HANDLER_H_