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

extensions/browser/api/display_source/display_source_connection_delegate.h

 // Copyright 2015 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 EXTENSIONS_BROWSER_API_DISPLAY_SOURCE_DISPLAY_SOURCE_CONNECTION_DELEGATE_H_
 #define EXTENSIONS_BROWSER_API_DISPLAY_SOURCE_DISPLAY_SOURCE_CONNECTION_DELEGATE_H_
 
 #include "base/callback.h"
 #include "base/observer_list.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "extensions/common/api/display_source.h"
 
 namespace extensions {
 
-using DisplaySourceSinkInfoPtr = linked_ptr<api::display_source::SinkInfo>;
-using DisplaySourceSinkInfoList = std::vector<DisplaySourceSinkInfoPtr>;
+using DisplaySourceSinkInfo = api::display_source::SinkInfo;
+using DisplaySourceSinkInfoList = std::vector<DisplaySourceSinkInfo>;
 using DisplaySourceAuthInfo = api::display_source::AuthenticationInfo;
 using DisplaySourceErrorType = api::display_source::ErrorType;
 // The DisplaySourceConnectionDelegate interface should be implemented
 // to provide sinks search and connection functionality for
 // 'chrome.displaySource' API.
 class DisplaySourceConnectionDelegate : public KeyedService {
  public:
   using AuthInfoCallback = base::Callback<void(const DisplaySourceAuthInfo&)>;
   using StringCallback = base::Callback<void(const std::string&)>;
   using SinkInfoListCallback =
       base::Callback<void(const DisplaySourceSinkInfoList&)>;
 
   const static int kInvalidSinkId = -1;
 
   class Connection {
    public:
-    // Returns a pointer to the connected sink object. The result is
-    // guaranteed not to be NULL.
-    virtual DisplaySourceSinkInfoPtr GetConnectedSink() const = 0;
+    // Returns the connected sink object.
+    virtual DisplaySourceSinkInfo GetConnectedSink() const = 0;
 
     // Returns the local address of the source.
     virtual std::string GetLocalAddress() const = 0;
 
     // Returns the address of the connected sink.
     virtual std::string GetSinkAddress() const = 0;
 
     // Sends a control message to the connected sink.
     // If an error occurs 'Observer::OnConnectionError' is invoked.
     virtual void SendMessage(const std::string& message) const = 0;
@@ skipping 34 matching lines @@
   ~DisplaySourceConnectionDelegate() override;
 
   virtual void AddObserver(Observer* observer);
   virtual void RemoveObserver(Observer* observer);
 
   // Returns the list of last found available sinks
   // this list may contain outdated data if the delegate
   // is not watching the sinks (via 'StartWatchingSinks'
   // method). The list is refreshed after 'GetAvailableSinks'
   // call.
-  virtual DisplaySourceSinkInfoList last_found_sinks() const = 0;
+  virtual const DisplaySourceSinkInfoList& last_found_sinks() const = 0;
 
   // Returns the Connection object representing the current
   // connection to the sink or NULL if there is no current connection.
   virtual const Connection* connection() const = 0;
 
   // Queries the list of currently available sinks.
   virtual void GetAvailableSinks(const SinkInfoListCallback& sinks_callback,
                                  const StringCallback& failure_callback) = 0;
 
   // Queries the authentication method required by the sink for connection.
@@ skipping 21 matching lines @@
   // Implementation should stop watching the available sinks updates.
   virtual void StopWatchingAvailableSinks() = 0;
 
  protected:
   base::ObserverList<Observer> observers_;
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_API_DISPLAY_SOURCE_DISPLAY_SOURCE_CONNECTION_DELEGATE_H_