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

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

 // Copyright 2013 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_EXTENSIONS_CHROMEOS_KIOSK_APPS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_CHROMEOS_KIOSK_APPS_HANDLER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h"
 #include "content/public/browser/web_ui_message_handler.h"
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 }
 
 namespace content {
 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);
 
   // content::WebUIMessageHandler overrides:
   void RegisterMessages() override;
 
   // KioskAppManagerObserver overrides:
   void OnKioskAppDataChanged(const std::string& app_id) override;
   void OnKioskAppDataLoadFailure(const std::string& app_id) override;
@@ skipping 19 matching lines @@
   void ShowError(const std::string& app_id);
 
   // Callback for KioskAppManager::GetConsumerKioskModeStatus().
   void OnGetConsumerKioskAutoLaunchStatus(
       chromeos::KioskAppManager::ConsumerKioskAutoLaunchStatus status);
 
   KioskAppManager* kiosk_app_manager_;  // not owned.
   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);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_CHROMEOS_KIOSK_APPS_HANDLER_H_