Rewrite implementation of ClipboardRecentContent in Objective C.

components/open_from_clipboard/clipboard_recent_content_ios.h

Index: components/open_from_clipboard/clipboard_recent_content_ios.h
diff --git a/components/open_from_clipboard/clipboard_recent_content_ios.h b/components/open_from_clipboard/clipboard_recent_content_ios.h
index d4b7d7ec831d06bd80e46dea4e7c04f23f0e2080..bfe5f9293f8f9a4632685514458798c293d62288 100644
--- a/components/open_from_clipboard/clipboard_recent_content_ios.h
+++ b/components/open_from_clipboard/clipboard_recent_content_ios.h
@@ -11,9 +11,10 @@
 #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;
 
@@ -30,49 +31,25 @@ class ClipboardRecentContentIOS : public ClipboardRecentContent {
                                      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);
+
+  // 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.

 
-  // 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_;
+  // 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);
 };