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

chrome/browser/ui/webui/options2/chromeos/accounts_options_handler2.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/options2/chromeos/accounts_options_handler2.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/cros_settings_names.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
+#include "content/browser/webui/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
 
 namespace {
 
 // Adds specified user to the whitelist. Returns false if that user is already
 // in the whitelist.
 bool WhitelistUser(const std::string& username) {
@@ skipping 95 matching lines @@
   DCHECK(args && args->empty());
 
   const UserList& users = UserManager::Get()->GetUsers();
   for (UserList::const_iterator it = users.begin(); it < users.end(); ++it) {
     WhitelistUser((*it)->email());
   }
 }
 
 }  // namespace options2
 }  // namespace chromeos