Add helpers IsRemoraRequisition/IsSharkRequisition.

BUG=374990
TEST=None
NOTRY=True

Review URL: https://codereview.chromium.org/388383002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283216 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 13 insertions, 5 deletions

diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
index aef2648..4814dcd 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
@@ -158,6 +158,14 @@ void DeviceCloudPolicyManagerChromeOS::SetDeviceRequisition(
   }
 }
 
+bool DeviceCloudPolicyManagerChromeOS::IsRemoraRequisition() const {
+  return GetDeviceRequisition() == kRemoraRequisition;
+}
+
+bool DeviceCloudPolicyManagerChromeOS::IsSharkRequisition() const {
+  return GetDeviceRequisition() == kSharkRequisition;
+}
+
 void DeviceCloudPolicyManagerChromeOS::Shutdown() {
   state_keys_update_subscription_.reset();
   CloudPolicyManager::Shutdown();
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
index de38c83..5cb0be5 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
@@ -51,6 +51,8 @@ class DeviceCloudPolicyManagerChromeOS : public CloudPolicyManager {
   // Gets/Sets the device requisition.
   std::string GetDeviceRequisition() const;
   void SetDeviceRequisition(const std::string& requisition);
+  bool IsRemoraRequisition() const;
+  bool IsSharkRequisition() const;
 
   // CloudPolicyManager:
   virtual void Shutdown() OVERRIDE;
diff --git a/chrome/browser/chromeos/system/input_device_settings.cc b/chrome/browser/chromeos/system/input_device_settings.cc
index 3e81875..744c926 100644
--- a/chrome/browser/chromeos/system/input_device_settings.cc
+++ b/chrome/browser/chromeos/system/input_device_settings.cc
@@ -37,9 +37,6 @@ const char kDeviceTypeTouchpad[] = "touchpad";
 const char kDeviceTypeMouse[] = "mouse";
 const char kInputControl[] = "/opt/google/input/inputcontrol";
 
-const char kRemoraRequisition[] = "remora";
-const char kSharkRequisition[] = "shark";
-
 typedef base::RefCountedData<bool> RefCountedBool;
 
 bool ScriptExists(const std::string& script) {
@@ -248,9 +245,10 @@ bool InputDeviceSettingsImpl::ForceKeyboardDrivenUINavigation() {
   if (!policy_manager)
     return false;
 
-  const std::string requisition = policy_manager->GetDeviceRequisition();
-  if (requisition == kRemoraRequisition || requisition == kSharkRequisition)
+  if (policy_manager->IsRemoraRequisition() ||
+      policy_manager->IsSharkRequisition()) {
     return true;
+  }
 
   bool keyboard_driven = false;
   if (chromeos::system::StatisticsProvider::GetInstance()->GetMachineFlag(