Refactor Clipboard Last Modified Time Storage

components/open_from_clipboard/clipboard_recent_content_generic.cc

 // Copyright 2017 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 "components/open_from_clipboard/clipboard_recent_content_generic.h"
 
 #include "base/strings/string_util.h"
 #include "ui/base/clipboard/clipboard.h"
 
 ClipboardRecentContentGeneric::ClipboardRecentContentGeneric() {}
 
 bool ClipboardRecentContentGeneric::GetRecentURLFromClipboard(GURL* url) {
-  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-  base::Time last_modified_time = clipboard->GetClipboardLastModifiedTime();
-  if (!last_modified_time_to_suppress_.is_null() &&
-      (last_modified_time == last_modified_time_to_suppress_))
-    return false;
-
   if (GetClipboardContentAge() > MaximumAgeOfClipboard())
     return false;
 
   // Get and clean up the clipboard before processing.
   std::string gurl_string;
+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
   clipboard->ReadAsciiText(ui::CLIPBOARD_TYPE_COPY_PASTE, &gurl_string);
   base::TrimWhitespaceASCII(gurl_string, base::TrimPositions::TRIM_ALL,
                             &gurl_string);
 
   // Interpret the clipboard as a URL if possible.
   DCHECK(url);
   // If there is mid-string whitespace, don't attempt to interpret the string
   // as a URL.  (Otherwise gurl will happily try to convert
   // "http://example.com extra words" into "http://example.com%20extra%20words",
   // which is not likely to be a useful or intended destination.)
@@ skipping 12 matching lines @@
         std::string::npos)
       return false;
     if (!gurl_string16.empty())
       *url = GURL(gurl_string16);
   }
   return url->is_valid() && IsAppropriateSuggestion(*url);
 }
 
 base::TimeDelta ClipboardRecentContentGeneric::GetClipboardContentAge() const {
   const base::Time last_modified_time =
-      ui::Clipboard::GetForCurrentThread()->GetClipboardLastModifiedTime();
+      ui::Clipboard::GetForCurrentThread()->GetLastModifiedTime();
   const base::Time now = base::Time::Now();
   // In case of system clock change, assume the last modified time is now.
   // (Don't return a negative age, i.e., a time in the future.)
   if (last_modified_time > now)
     return base::TimeDelta();
   return now - last_modified_time;
 }
 
 void ClipboardRecentContentGeneric::SuppressClipboardContent() {
   // User cleared the user data.  The pasteboard entry must be removed from the
-  // omnibox list.  Do this by suppressing all clipboard content with the
-  // current clipboard content's time.  Then we only suggest the clipboard
-  // content later if the time changed.
-  last_modified_time_to_suppress_ =
-      ui::Clipboard::GetForCurrentThread()->GetClipboardLastModifiedTime();
+  // omnibox list.  Do this by pretending the current clipboard is ancient,
+  // not recent.
+  ui::Clipboard::GetForCurrentThread()->ClearLastModifiedTime();
 }