[Extensions] Convert APIs to use movable types [1]

chrome/browser/extensions/activity_log/activity_actions.h

 // Copyright (c) 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_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_ACTIONS_H_
 #define CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_ACTIONS_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 105 matching lines @@
   std::string SerializePageUrl() const;
   void ParsePageUrl(const std::string& url);
   std::string SerializeArgUrl() const;
   void ParseArgUrl(const std::string& url);
 
   // Number of merged records for this action.
   int count() const { return count_; }
   void set_count(int count) { count_ = count; }
 
   // Flatten the activity's type-specific fields into an ExtensionActivity.
-  scoped_ptr<api::activity_log_private::ExtensionActivity>
-      ConvertToExtensionActivity();
+  api::activity_log_private::ExtensionActivity ConvertToExtensionActivity();
 
   // Print an action as a regular string for debugging purposes.
   virtual std::string PrintForDebug() const;
 
  protected:
   virtual ~Action();
 
  private:
   friend class base::RefCountedThreadSafe<Action>;
 
@@ skipping 27 matching lines @@
 // comparisons.
 struct ActionComparatorExcludingTimeAndActionId {
   // Evaluates the comparison lhs < rhs.
   bool operator()(const scoped_refptr<Action>& lhs,
                   const scoped_refptr<Action>& rhs) const;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_ACTIONS_H_