Use kMetricsReportingEnabled instead of kStatsReporingPref on metrics side

chrome/browser/ui/webui/options/browser_options_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 350 matching lines @@
   // Setup the UI specific to managing supervised users.
   void SetupManagingSupervisedUsers();
 
   // Setup the UI for Easy Unlock.
   void SetupEasyUnlock();
 
   // Setup the UI for showing which settings are extension controlled.
   void SetupExtensionControlledIndicators();
 
   // Setup the value and the disabled property for metrics reporting for (except
-  // CrOS and Android).
+  // Android).
   void SetupMetricsReportingCheckbox();
 
   // Called when the MetricsReportingEnabled checkbox values are changed.
   // |args| will contain the checkbox checked state as a boolean.
   void HandleMetricsReportingChange(const base::ListValue* args);
 
   // Notifies the result of MetricsReportingEnabled change to Javascript layer.
   void MetricsReportingChangeCallback(bool enabled);

[Alexei Svitkine (slow), 2015/11/03 19:55:25]

I find the name of this method not very intuitive. I know it was like that
before, but can you change it to be more meaningful?

e.g. NotifyPageOfMetricsReportingChange()?

[gayane -on leave until 09-2017, 2015/11/03 21:54:22]

Done.

 
   // Calls a Javascript function to set the state of MetricsReporting checkbox.
-  void SetMetricsReportingCheckbox(bool checked, bool disabled);
+  void SetMetricsReportingCheckbox(bool checked,
+                                   bool policy_managed,
+                                   bool owner_managed);
 
 #if defined(OS_CHROMEOS)
   // Setup the accessibility features for ChromeOS.
   void SetupAccessibilityFeatures();
 #endif
 
   // Returns a newly created dictionary with a number of properties that
   // correspond to the status of sync.
   scoped_ptr<base::DictionaryValue> GetSyncStateDictionary();
 
+  // Checks whether on Chrome OS the current user is the device owner. Returns
+  // true on other platforms.
+  bool IsDeviceOwnerProfile();
+
   scoped_refptr<ShellIntegration::DefaultBrowserWorker> default_browser_worker_;
 
   bool page_initialized_;
 
   StringPrefMember homepage_;
   BooleanPrefMember default_browser_policy_;
 
   TemplateURLService* template_url_service_;  // Weak.
 
   scoped_refptr<ui::SelectFileDialog> select_folder_dialog_;
@@ skipping 15 matching lines @@
 
   // Used to get WeakPtr to self for use on the UI thread.
   base::WeakPtrFactory<BrowserOptionsHandler> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserOptionsHandler);
 };
 
 }  // namespace options
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_