Switch to direct use of OwnerSettingsServiceChromeOS::Set() in tests.

chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h

Index: chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h
diff --git a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h
index 23df3a1450304eef77346f168f71b39138334e39..3697ab38e96a1d46c77b2c2c26c3dbdeb1dbcedf 100644
--- a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h
+++ b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h
@@ -25,11 +25,12 @@ class WebUIDataSource;
 namespace chromeos {
 
 class KioskAppManager;
+class OwnerSettingsServiceChromeOS;
 
 class KioskAppsHandler : public content::WebUIMessageHandler,
                          public KioskAppManagerObserver {
  public:
-  KioskAppsHandler();
+  explicit KioskAppsHandler(OwnerSettingsServiceChromeOS* service);

[xiyuan, 2015/04/13 17:15:12]

Can we use OwnerSettingsServiceChromeOS::FromWebUI instead of passing and
storing a pointer?

[Ivan Podogov, 2015/04/14 08:04:18]

Using OwnerSettingsServiceChromeOS::FromWebUI is not a problem (one of the first
patchsets did just that), I just wanted it to be available since construction.
The alternative is to set it in the RegisterMessages() call triggered by
"web_ui->AddMessageHandler(kiosk_app_handler)" (as web_ui() doesn't have any
value before that), which is not that obvious.
As for storing the pointer, it actually makes code cleaner: there are six calls
that use it right now, and adding copy-pasted FromWebUI call to all of them
wouldn't help in readability. Basically, it is here for the same reason the
kiosk_app_manager_ is.

   ~KioskAppsHandler() override;
 
   void GetLocalizedValues(content::WebUIDataSource* source);
@@ -69,6 +70,7 @@ class KioskAppsHandler : public content::WebUIMessageHandler,
   bool initialized_;
   bool is_kiosk_enabled_;
   bool is_auto_launch_enabled_;
+  OwnerSettingsServiceChromeOS* const owner_settings_service_;

[Nikita (slow), 2015/04/13 12:49:23]

nit: // not owned.

[Ivan Podogov, 2015/04/14 14:40:37]

Done.

   base::WeakPtrFactory<KioskAppsHandler> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(KioskAppsHandler);