CrOS settings/metrics: Correctly store Subscriptions

chrome/browser/ui/webui/options/browser_options_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/options/browser_options_handler.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <utility>
@@ skipping 112 matching lines @@
 #include "ash/shell.h"  // nogncheck
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/reset/metrics.h"
-#include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/system/timezone_util.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "components/arc/arc_util.h"
@@ skipping 990 matching lines @@
         policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME, std::string())));
     policy_registrar_->Observe(
         policy::key::kUserAvatarImage,
         base::Bind(&BrowserOptionsHandler::OnUserImagePolicyChanged,
                    base::Unretained(this)));
     policy_registrar_->Observe(
         policy::key::kWallpaperImage,
         base::Bind(&BrowserOptionsHandler::OnWallpaperPolicyChanged,
                    base::Unretained(this)));
   }
-  chromeos::CrosSettings::Get()->AddSettingsObserver(
-      chromeos::kSystemTimezonePolicy,
-      base::Bind(&BrowserOptionsHandler::OnSystemTimezonePolicyChanged,
-                 weak_ptr_factory_.GetWeakPtr()));
+  system_timezone_policy_observer_ =
+      chromeos::CrosSettings::Get()->AddSettingsObserver(
+          chromeos::kSystemTimezonePolicy,
+          base::Bind(&BrowserOptionsHandler::OnSystemTimezonePolicyChanged,
+                     weak_ptr_factory_.GetWeakPtr()));
   local_state_pref_change_registrar_.Init(g_browser_process->local_state());
   local_state_pref_change_registrar_.Add(
       prefs::kSystemTimezoneAutomaticDetectionPolicy,
       base::Bind(&BrowserOptionsHandler::
                      OnSystemTimezoneAutomaticDetectionPolicyChanged,
                  base::Unretained(this)));
   ArcAppListPrefs* arc_prefs = ArcAppListPrefs::Get(profile);
   if (arc_prefs)
     arc_prefs->AddObserver(this);
 #else  // !defined(OS_CHROMEOS)
@@ skipping 1206 matching lines @@
 
 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
 #if defined(OS_CHROMEOS)
   return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
 #else
   return true;
 #endif
 }
 
 }  // namespace options