Settings Rewrite: Fork SyncSetupHandler for MD-Settings

chrome/browser/ui/webui/sync_setup_handler_unittest.cc

 // Copyright (c) 2012 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.
 
-#include "chrome/browser/ui/webui/options/sync_setup_handler.h"
+#include "chrome/browser/ui/webui/sync_setup_handler.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/signin/fake_signin_manager_builder.h"
@@ skipping 121 matching lines @@
   CheckBool(dictionary, "extensionsSynced", types.Has(syncer::EXTENSIONS));
   CheckBool(dictionary, "passwordsSynced", types.Has(syncer::PASSWORDS));
   CheckBool(dictionary, "preferencesSynced", types.Has(syncer::PREFERENCES));
   CheckBool(dictionary, "tabsSynced", types.Has(syncer::PROXY_TABS));
   CheckBool(dictionary, "themesSynced", types.Has(syncer::THEMES));
   CheckBool(dictionary, "typedUrlsSynced", types.Has(syncer::TYPED_URLS));
   CheckBool(dictionary, "wifiCredentialsSynced",
             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 {}
 
   Profile* GetProfile() const override { return profile_; }
 
   using SyncSetupHandler::is_configuring_sync;
 
  private:
 #if !defined(OS_CHROMEOS)
   void DisplayGaiaLoginInNewTabOrWindow() override {}
@@ skipping 818 matching lines @@
   EXPECT_CALL(*mock_pss_, IsEncryptEverythingAllowed())
       .WillRepeatedly(Return(false));
   EXPECT_CALL(*mock_pss_, EnableEncryptEverything()).Times(0);
   EXPECT_CALL(*mock_pss_, OnUserChoseDatatypes(true, _));
   handler_->HandleConfigure(&list_args);
 
   // Ensure that we navigated to the "done" state since we don't need a
   // passphrase.
   ExpectDone();
 }
-