Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership...

chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc

 // 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.
 
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/browser/ui/webui/options/core_options_handler.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_handler.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_trial.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/webui/web_ui.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/url_util.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::WebContents;
 
 namespace {
@@ skipping 64 matching lines @@
           *out_value = "";
         return true;
       }
     }
   }
   return false;
 }
 
 }  // namespace
 
-SyncPromoUI::SyncPromoUI(WebContents* contents) : WebUI(contents, this) {
-  should_hide_url_ = true;
+SyncPromoUI::SyncPromoUI(WebUI* web_ui) : WebUIController(web_ui) {
+  web_ui->HideURL();
 
   SyncPromoHandler* handler = new SyncPromoHandler(
       g_browser_process->profile_manager());
-  AddMessageHandler(handler);
+  web_ui->AddMessageHandler(handler);
 
   // Set up the chrome://theme/ source.
+  WebContents* contents = web_ui->web_contents();
   Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
   ThemeSource* theme = new ThemeSource(profile);
   profile->GetChromeURLDataManager()->AddDataSource(theme);
 
   // Set up the sync promo source.
-  SyncPromoUIHTMLSource* html_source = new SyncPromoUIHTMLSource(this);
+  SyncPromoUIHTMLSource* html_source = new SyncPromoUIHTMLSource(web_ui);
   html_source->set_json_path(kStringsJsFile);
   html_source->add_resource_path(kSyncPromoJsFile, IDR_SYNC_PROMO_JS);
   html_source->set_default_resource(IDR_SYNC_PROMO_HTML);
   profile->GetChromeURLDataManager()->AddDataSource(html_source);
 
   if (sync_promo_trial::IsPartOfBrandTrialToEnable()) {
     bool is_start_up = GetIsLaunchPageForSyncPromoURL(contents->GetURL());
     sync_promo_trial::RecordUserShownPromoWithTrialBrand(is_start_up, profile);
   }
 }
@@ skipping 136 matching lines @@
     UTF16ToUTF8(output.data(), output.length(), &url);
     return GURL(url);
   }
   return GURL();
 }
 
 // static
 bool SyncPromoUI::UserHasSeenSyncPromoAtStartup(Profile* profile) {
   return profile->GetPrefs()->GetInteger(prefs::kSyncPromoStartupCount) > 0;
 }