Revert of Call to CrosSettings::Set() is replaced by OwnerSettingsService::Set() in VersionUpda...

chrome/browser/ui/webui/help/help_handler.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/help/help_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 15 matching lines @@
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/google_chrome_strings.h"
 #include "components/google/core/browser/google_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
-#include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/user_agent.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "v8/include/v8.h"
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/mac/obsolete_system.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "base/files/file_util_proxy.h"
 #include "base/i18n/time_formatting.h"
 #include "base/prefs/pref_service.h"
 #include "base/sys_info.h"
 #include "base/task_runner_util.h"
-#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
-#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
-#include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chromeos/image_source.h"
 #include "chrome/browser/ui/webui/help/help_utils_chromeos.h"
 #include "chrome/browser/ui/webui/help/version_updater_chromeos.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "components/user_manager/user_manager.h"
 #endif
@@ skipping 19 matching lines @@
 }
 
 // Returns true if the device is enterprise managed, false otherwise.
 bool IsEnterpriseManaged() {
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   return connector->IsEnterpriseManaged();
 }
 
 // Returns true if current user can change channel, false otherwise.
-bool CanChangeChannel(Profile* profile) {
+bool CanChangeChannel() {
   bool value = false;
   chromeos::CrosSettings::Get()->GetBoolean(chromeos::kReleaseChannelDelegated,
                                             &value);
 
   // On a managed machine we delegate this setting to the users of the same
   // domain only if the policy value is "domain".
   if (IsEnterpriseManaged()) {
     if (!value)
       return false;
     // Get the currently logged in user and strip the domain part only.
     std::string domain = "";
-    const user_manager::User* user =
-        profile ? chromeos::ProfileHelper::Get()->GetUserByProfile(profile)
-                : nullptr;
-    std::string email = user ? user->email() : std::string();
-    size_t at_pos = email.find('@');
-    if (at_pos != std::string::npos && at_pos + 1 < email.length())
-      domain = email.substr(email.find('@') + 1);
+    std::string user =
+        user_manager::UserManager::Get()->GetLoggedInUser()->email();
+    size_t at_pos = user.find('@');
+    if (at_pos != std::string::npos && at_pos + 1 < user.length())
+      domain = user.substr(user.find('@') + 1);
     policy::BrowserPolicyConnectorChromeOS* connector =
         g_browser_process->platform_part()->browser_policy_connector_chromeos();
     return domain == connector->GetEnterpriseDomain();
-  } else {
-    chromeos::OwnerSettingsServiceChromeOS* service =
-        chromeos::OwnerSettingsServiceChromeOSFactory::GetInstance()
-            ->GetForBrowserContext(profile);
+  } else if (user_manager::UserManager::Get()->IsCurrentUserOwner()) {
     // On non managed machines we have local owner who is the only one to change
     // anything. Ensure that ReleaseChannelDelegated is false.
-    if (service && service->IsOwner())
-      return !value;
+    return !value;
   }
   return false;
 }
 
 // Reads the file containing the FCC label text, if found. Must be called from
 // the blocking pool.
 std::string ReadFCCLabelText() {
   const base::FilePath asset_dir(FILE_PATH_LITERAL(chrome::kChromeOSAssetPath));
   const base::FilePath label_file_path =
       asset_dir.AppendASCII(kFCCLabelTextPath);
 
   std::string contents;
   if (base::ReadFileToString(label_file_path, &contents))
     return contents;
   return std::string();
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace
 
 HelpHandler::HelpHandler()
-    : version_updater_(VersionUpdater::Create(nullptr)), weak_factory_(this) {
+    : version_updater_(VersionUpdater::Create()),
+      weak_factory_(this) {
 }
 
 HelpHandler::~HelpHandler() {
 }
 
 void HelpHandler::GetLocalizedValues(base::DictionaryValue* localized_strings) {
   struct L10nResources {
     const char* name;
     int ids;
   };
@@ skipping 133 matching lines @@
   localized_strings->SetString("jsEngineVersion", v8::V8::GetVersion());
 
   localized_strings->SetString("userAgentInfo", GetUserAgent());
 
   CommandLine::StringType command_line =
       CommandLine::ForCurrentProcess()->GetCommandLineString();
   localized_strings->SetString("commandLineInfo", command_line);
 }
 
 void HelpHandler::RegisterMessages() {
-#if defined(OS_CHROMEOS)
-  version_updater_.reset(
-      VersionUpdater::Create(web_ui()->GetWebContents()->GetBrowserContext()));
-#endif
   registrar_.Add(this, chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
                  content::NotificationService::AllSources());
 
   web_ui()->RegisterMessageCallback("onPageLoaded",
       base::Bind(&HelpHandler::OnPageLoaded, base::Unretained(this)));
   web_ui()->RegisterMessageCallback("relaunchNow",
       base::Bind(&HelpHandler::RelaunchNow, base::Unretained(this)));
   web_ui()->RegisterMessageCallback("openFeedbackDialog",
       base::Bind(&HelpHandler::OpenFeedbackDialog, base::Unretained(this)));
   web_ui()->RegisterMessageCallback("openHelpPage",
@@ skipping 55 matching lines @@
   loader_.GetVersion(
       chromeos::VersionLoader::VERSION_FULL,
       base::Bind(&HelpHandler::OnOSVersion, base::Unretained(this)),
       &tracker_);
   loader_.GetFirmware(
       base::Bind(&HelpHandler::OnOSFirmware, base::Unretained(this)),
       &tracker_);
 
   web_ui()->CallJavascriptFunction(
       "help.HelpPage.updateEnableReleaseChannel",
-      base::FundamentalValue(CanChangeChannel(Profile::FromWebUI(web_ui()))));
+      base::FundamentalValue(CanChangeChannel()));
 
   base::Time build_time = base::SysInfo::GetLsbReleaseTime();
   base::string16 build_date = base::TimeFormatFriendlyDate(build_time);
   web_ui()->CallJavascriptFunction("help.HelpPage.setBuildDate",
                                    base::StringValue(build_date));
 #endif  // defined(OS_CHROMEOS)
 
   // On Chrome OS, do not check for an update automatically.
 #if defined(OS_CHROMEOS)
   static_cast<VersionUpdaterCros*>(version_updater_.get())->GetUpdateStatus(
@@ skipping 57 matching lines @@
   Browser* browser = chrome::FindBrowserWithWebContents(
       web_ui()->GetWebContents());
   chrome::ShowHelp(browser, chrome::HELP_SOURCE_WEBUI);
 }
 
 #if defined(OS_CHROMEOS)
 
 void HelpHandler::SetChannel(const base::ListValue* args) {
   DCHECK(args->GetSize() == 2);
 
-  if (!CanChangeChannel(Profile::FromWebUI(web_ui()))) {
+  if (!CanChangeChannel()) {
     LOG(WARNING) << "Non-owner tried to change release track.";
     return;
   }
 
   base::string16 channel;
   bool is_powerwash_allowed;
   if (!args->GetString(0, &channel) ||
       !args->GetBoolean(1, &is_powerwash_allowed)) {
     LOG(ERROR) << "Can't parse SetChannel() args";
     return;
@@ skipping 135 matching lines @@
 }
 
 void HelpHandler::OnFCCLabelTextRead(const std::string& text) {
   // Remove unnecessary whitespace.
   web_ui()->CallJavascriptFunction(
       "help.HelpPage.setProductLabelText",
       base::StringValue(base::CollapseWhitespaceASCII(text, true)));
 }
 
 #endif // defined(OS_CHROMEOS)