Settings Rewrite: Fork SyncSetupHandler for MD-Settings

chrome/browser/ui/webui/sync_setup_handler_unittest.cc

Index: chrome/browser/ui/webui/sync_setup_handler_unittest.cc
diff --git a/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
similarity index 99%
rename from chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc
rename to chrome/browser/ui/webui/sync_setup_handler_unittest.cc
index 233d473d59d94097c5ca65ddb479caca04d0d7cd..6db00db5a009542ccd2d86fea8ee44703205dd20 100644
--- a/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/webui/options/sync_setup_handler.h"
+#include "chrome/browser/ui/webui/sync_setup_handler.h"
 
 #include <vector>
 
@@ -144,16 +144,13 @@ void CheckConfigDataTypeArguments(const base::DictionaryValue* dictionary,
             types.Has(syncer::WIFI_CREDENTIALS));
 }
 
-
 }  // namespace
 
 class TestingSyncSetupHandler : public SyncSetupHandler {
  public:
   TestingSyncSetupHandler(content::WebUI* web_ui, Profile* profile)
-      : profile_(profile) {
-    set_web_ui(web_ui);
-  }
-  ~TestingSyncSetupHandler() override { set_web_ui(NULL); }

[Dan Beam, 2015/10/29 01:47:20]

do we know why this was necessary?

[tommycli, 2015/10/29 17:34:14]

Yeah, this is necessary because of:
https://code.google.com/p/chromium/codesearch/#chromium/src/chrome/browser/ui...

It's not optimal, but probably better than adding a separate member variable
(for now).

+      : SyncSetupHandler(web_ui), profile_(profile) {}
+  ~TestingSyncSetupHandler() override { set_web_ui(nullptr); }
 
   void FocusUI() override {}
 
@@ -992,4 +989,3 @@ TEST_F(SyncSetupHandlerTest, TurnOnEncryptAllDisallowed) {
   // passphrase.
   ExpectDone();
 }
-