Fix remaining incompatibilities between scoped_ptr and unique_ptr.

chrome/browser/signin/easy_unlock_screenlock_state_handler_unittest.cc

 // Copyright 2014 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/signin/easy_unlock_screenlock_state_handler.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <vector>
@@ skipping 121 matching lines @@
 
   // Returns the number of times an icon was shown since the last call to this
   // method.
   size_t GetAndResetShowIconCount() {
     size_t result = show_icon_count_;
     show_icon_count_ = 0u;
     return result;
   }
 
   // Whether the custom icon is set.
-  bool HasCustomIcon() const {
-    return last_custom_icon_;
-  }
+  bool HasCustomIcon() const { return !!last_custom_icon_; }
 
   // If custom icon is set, returns the icon's id.
   // If there is no icon, or if it doesn't have an id set, returns an empty
   // string.
   std::string GetCustomIconId() const {
     std::string result;
     if (last_custom_icon_)
       last_custom_icon_->GetString("id", &result);
     return result;
   }
@@ skipping 587 matching lines @@
   state_handler_->RecordClickOnLockIcon();
   histogram_tester.ExpectTotalCount("EasyUnlock.TrialRun.Events", 4);
   histogram_tester.ExpectBucketCount("EasyUnlock.TrialRun.Events",
                                      EASY_UNLOCK_TRIAL_RUN_EVENT_LAUNCHED, 1);
   histogram_tester.ExpectBucketCount(
       "EasyUnlock.TrialRun.Events",
       EASY_UNLOCK_TRIAL_RUN_EVENT_CLICKED_LOCK_ICON, 3);
 }
 
 }  // namespace