Rewrite implementation of ClipboardRecentContent in Objective C.

components/open_from_clipboard/clipboard_recent_content_ios.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 COMPONENTS_OPEN_FROM_CLIPBOARD_CLIPBOARD_RECENT_CONTENT_IOS_H_
 #define COMPONENTS_OPEN_FROM_CLIPBOARD_CLIPBOARD_RECENT_CONTENT_IOS_H_
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "components/open_from_clipboard/clipboard_recent_content.h"
 #include "url/gurl.h"
 
+@class NSArray;
 @class NSDate;
 @class NSUserDefaults;
-@class ApplicationDidBecomeActiveNotificationListenerBridge;
+@class ClipboardRecentContentIOSImpl;
 
 class ClipboardRecentContentIOSTest;
 
 // IOS implementation of ClipboardRecentContent
 class ClipboardRecentContentIOS : public ClipboardRecentContent {
  public:
   // |application_scheme| is the URL scheme that can be used to open the
   // current application, may be empty if no such scheme exists. Used to
   // determine whether or not the clipboard contains a relevant URL.
   // |group_user_defaults| is the NSUserDefaults used to store information on
   // pasteboard entry expiration. This information will be shared with other
   // application in the application group.
   explicit ClipboardRecentContentIOS(const std::string& application_scheme,

[sdefresne, 2017/04/03 09:27:16]

Remove "explicit", it is only necessary when the constructor can be used with
exactly one argument (this is not the case here).

To allow for easier testing, you should instead allow client code to inject the
ClipboardRecentContentIOSImpl instance to use (rule-of-thumb, if there is object
creation in the implementation of your code, it is going to be tough to unit
test, better to use factory/injection to make code easier to test).

  ClipboardRecentContentIOS(const std::string& application_scheme,
                            NSUserDefaults* group_user_defaults);
  ClipboardRecentContentIOS(const std::string& application_scheme,
                            NSUserDefaults* group_user_defaults,
                            ClipboardRecentContentIOSImpl* implementation);

[lody, 2017/04/04 13:42:18]

Done.

                                      NSUserDefaults* group_user_defaults);
   ~ClipboardRecentContentIOS() override;
 
-  // If the content of the pasteboard has changed, updates the change count,
-  // change date, and md5 of the latest pasteboard entry if necessary.
-  void UpdateIfNeeded();
-
-  // Returns whether the pasteboard changed since the last time a pasteboard
-  // change was detected.
-  bool HasPasteboardChanged() const;
-
-  // Loads information from the user defaults about the latest pasteboard entry.
-  void LoadFromUserDefaults();
-
   // ClipboardRecentContent implementation.
   bool GetRecentURLFromClipboard(GURL* url) override;
   base::TimeDelta GetClipboardContentAge() const override;
   void SuppressClipboardContent() override;
 
- protected:
-  // Returns the uptime. Override in tests to return custom value.
-  virtual base::TimeDelta Uptime() const;
-
  private:
   friend class ClipboardRecentContentIOSTest;
 
   // Saves information to the user defaults about the latest pasteboard entry.
   void SaveToUserDefaults();
 
-  // Returns the URL contained in the clipboard (if any).
-  GURL URLFromPasteboard();
+  // Set estimation of the date when the pasteboard changed.

[sdefresne, 2017/04/03 09:27:16]

This is not necessary. Since you inject a subclass of
ClipboardRecentContentIOSImpl during test, you can keep a pointer to the
injected object, and call the method on it directly.

[lody, 2017/04/04 13:42:18]

Done.

+  void SetLastPasteboardChangeDate(NSDate* date);
 
-  // Contains the URL scheme opening the app. May be empty.
-  std::string application_scheme_;
-  // The pasteboard's change count. Increases everytime the pasteboard changes.
-  NSInteger last_pasteboard_change_count_;
-  // Estimation of the date when the pasteboard changed.
-  base::scoped_nsobject<NSDate> last_pasteboard_change_date_;
-  // MD5 hash of the last registered pasteboard entry.
-  base::scoped_nsobject<NSData> last_pasteboard_entry_md5_;
-  // Bridge to receive notifications when the application becomes active.
-  base::scoped_nsobject<ApplicationDidBecomeActiveNotificationListenerBridge>
-      notification_bridge_;
-  // The user defaults from the app group used to optimize the pasteboard change
-  // detection.
-  base::scoped_nsobject<NSUserDefaults> shared_user_defaults_;
+  // Get the list of authorized schemes.
+  NSArray* GetAuthorizedSchemeList(const std::string& application_scheme);

[sdefresne, 2017/04/03 09:27:16]

This does not have to be part of the class API, make it a free function in the
implementation file.

For test, when creating the fake ClipboardRecentContentIOSImpl, just inject list
of schemes defined in the test file and tests that the code respect that list.

[lody, 2017/04/04 13:42:18]

Done.

+
+  // The implementation instance.
+  base::scoped_nsobject<ClipboardRecentContentIOSImpl> implementation_;

[sdefresne, 2017/04/03 09:27:16]

I don't like "implementation_" as a field member name.

 
   DISALLOW_COPY_AND_ASSIGN(ClipboardRecentContentIOS);
 };
 
 #endif  // COMPONENTS_OPEN_FROM_CLIPBOARD_CLIPBOARD_RECENT_CONTENT_IOS_H_