Convert Pass()→std::move() in //chrome/browser/ui

chrome/browser/ui/webui/foreign_session_handler.cc

 // 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.
 
 #include "chrome/browser/ui/webui/foreign_session_handler.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 52 matching lines @@
   scoped_ptr<base::DictionaryValue> dictionary(new base::DictionaryValue());
   NewTabUI::SetUrlTitleAndDirection(dictionary.get(),
                                     current_navigation.title(), tab_url);
   dictionary->SetString("type", "tab");
   dictionary->SetDouble("timestamp",
                         static_cast<double>(tab.timestamp.ToInternalValue()));
   // TODO(jeremycho): This should probably be renamed to tabId to avoid
   // confusion with the ID corresponding to a session.  Investigate all the
   // places (C++ and JS) where this is being used.  (http://crbug.com/154865).
   dictionary->SetInteger("sessionId", tab.tab_id.id());
-  return dictionary.Pass();
+  return dictionary;
 }
 
 // Helper for initializing a boilerplate SessionWindow JSON compatible object.
 scoped_ptr<base::DictionaryValue> BuildWindowData(
     base::Time modification_time,
     SessionID::id_type window_id) {
   scoped_ptr<base::DictionaryValue> dictionary(new base::DictionaryValue());
   // The items which are to be written into |dictionary| are also described in
   // chrome/browser/resources/ntp4/other_sessions.js in @typedef for WindowData.
   // Please update it whenever you add or remove any keys here.
   dictionary->SetString("type", "window");
   dictionary->SetDouble("timestamp", modification_time.ToInternalValue());
   const base::TimeDelta last_synced = base::Time::Now() - modification_time;
   // If clock skew leads to a future time, or we last synced less than a minute
   // ago, output "Just now".
   dictionary->SetString(
       "userVisibleTimestamp",
       last_synced < base::TimeDelta::FromMinutes(1)
           ? l10n_util::GetStringUTF16(IDS_SYNC_TIME_JUST_NOW)
           : ui::TimeFormat::Simple(ui::TimeFormat::FORMAT_ELAPSED,
                                    ui::TimeFormat::LENGTH_SHORT, last_synced));
 
   dictionary->SetInteger("sessionId", window_id);
-  return dictionary.Pass();
+  return dictionary;
 }
 
 // Helper method to create JSON compatible objects from SessionWindow objects.
 scoped_ptr<base::DictionaryValue> SessionWindowToValue(
     const ::sessions::SessionWindow& window) {
   if (window.tabs.empty())
     return nullptr;
   scoped_ptr<base::ListValue> tab_values(new base::ListValue());
   // Calculate the last |modification_time| for all entries within a window.
   base::Time modification_time = window.timestamp;
   for (const ::sessions::SessionTab* tab : window.tabs) {
     scoped_ptr<base::DictionaryValue> tab_value(SessionTabToValue(*tab));
     if (tab_value.get()) {
       modification_time = std::max(modification_time,
                                    tab->timestamp);
       tab_values->Append(tab_value.release());
     }
   }
   if (tab_values->GetSize() == 0)
     return nullptr;
   scoped_ptr<base::DictionaryValue> dictionary(
     BuildWindowData(window.timestamp, window.window_id.id()));
   dictionary->Set("tabs", tab_values.release());
-  return dictionary.Pass();
+  return dictionary;
 }
 
 }  // namespace
 
 ForeignSessionHandler::ForeignSessionHandler() : scoped_observer_(this) {
   load_attempt_time_ = base::TimeTicks::Now();
 }
 
 ForeignSessionHandler::~ForeignSessionHandler() {}
 
@@ skipping 298 matching lines @@
   // collapsed state persists.
   PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
   DictionaryPrefUpdate update(prefs, prefs::kNtpCollapsedForeignSessions);
   if (is_collapsed)
     update.Get()->SetBoolean(session_tag, true);
   else
     update.Get()->Remove(session_tag, NULL);
 }
 
 }  // namespace browser_sync