Revert collecting clipboard statistics as we don't need it anymore.

See comment https://code.google.com/p/chromium/issues/detail?id=171974#c20

This reverts CL https://chromiumcodereview.appspot.com/12313009

BUG=171974


Review URL: https://chromiumcodereview.appspot.com/13460005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191849 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 2 insertions, 70 deletions

diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc
index b0c6333..de3b05b 100644
--- a/content/browser/browser_context.cc
+++ b/content/browser/browser_context.cc
@@ -114,17 +114,8 @@ class OffTheRecordClipboardDestroyer : public base::SupportsUserData::Data {
   void ExamineClipboard(ui::Clipboard* clipboard,
                         ui::Clipboard::Buffer buffer) {
     ui::Clipboard::SourceTag source_tag = clipboard->ReadSourceTag(buffer);
-    if (source_tag == ui::Clipboard::SourceTag(this)) {
-      if (buffer == ui::Clipboard::BUFFER_STANDARD) {
-        // We want to leave invalid SourceTag in the clipboard in order to
-        // collect statistics later.
-        clipboard->WriteObjects(buffer,
-                                ui::Clipboard::ObjectMap(),
-                                ui::Clipboard::kInvalidSourceTag);
-      } else {
-        clipboard->Clear(buffer);
-      }
-    }
+    if (source_tag == ui::Clipboard::SourceTag(this))
+      clipboard->Clear(buffer);
   }
 };
 
diff --git a/ui/base/clipboard/clipboard.cc b/ui/base/clipboard/clipboard.cc
index 32cea0e..e384c65 100644
--- a/ui/base/clipboard/clipboard.cc
+++ b/ui/base/clipboard/clipboard.cc
@@ -9,7 +9,6 @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/metrics/histogram.h"
 #include "base/synchronization/lock.h"
 #include "ui/gfx/size.h"
 
@@ -104,8 +103,6 @@ union SourceTag2BinaryHelper {
 
 }  // namespace
 
-const Clipboard::SourceTag Clipboard::kInvalidSourceTag =
-    reinterpret_cast<void*>(1);
 const char Clipboard::kMimeTypeText[] = "text/plain";
 const char Clipboard::kMimeTypeURIList[] = "text/uri-list";
 const char Clipboard::kMimeTypeDownloadURL[] = "downloadurl";
@@ -189,8 +186,6 @@ void Clipboard::WriteObjects(Buffer buffer,
   WriteObjectsImpl(buffer, objects, tag);
   if (!write_objects_callback_.is_null())
     write_objects_callback_.Run(buffer);
-  ReportAction(buffer, tag == SourceTag() ? WRITE_CLIPBOARD_NO_SOURCE_TAG
-                                          : WRITE_CLIPBOARD_SOURCE_TAG);
 }
 
 void Clipboard::DispatchObject(ObjectType type, const ObjectMapParams& params) {
@@ -304,31 +299,4 @@ void Clipboard::ReplaceSharedMemHandle(ObjectMap* objects,
   }
 }
 
-void Clipboard::ReportAction(Buffer buffer, TrackedAction action) const
-{
-  if (buffer != BUFFER_STANDARD)
-    return;
-
-  switch (action) {
-    case WRITE_CLIPBOARD_NO_SOURCE_TAG:
-    case WRITE_CLIPBOARD_SOURCE_TAG:
-      UMA_HISTOGRAM_ENUMERATION("Clipboard.IncognitoUseCase",
-                                action,
-                                MAX_TRACKED_ACTION);
-      break;
-    // The code below counts cases when there is the kInvalidSourceTag in the
-    // clipboard. That is, original data came from Incognito window and was
-    // destroyed with that window.
-    case READ_TEXT:
-      if (kInvalidSourceTag == ReadSourceTag(buffer)) {
-        UMA_HISTOGRAM_ENUMERATION("Clipboard.IncognitoUseCase",
-                                  action,
-                                  MAX_TRACKED_ACTION);
-      }
-      break;
-    case MAX_TRACKED_ACTION:
-      break;
-  }
-}
-
 }  // namespace ui
diff --git a/ui/base/clipboard/clipboard.h b/ui/base/clipboard/clipboard.h
index 0b47492..3119b66 100644
--- a/ui/base/clipboard/clipboard.h
+++ b/ui/base/clipboard/clipboard.h
@@ -175,8 +175,6 @@ class UI_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) {
   // WriteObject() caller can use the SourceTag that will be stored in the
   // clipboard. NULL value means "no tag".
   typedef void* SourceTag;
-  // kInvalidSourceTag is not NULL but a special value != any pointer.
-  static const SourceTag kInvalidSourceTag;
   static ObjectMapParam SourceTag2Binary(SourceTag tag);
   static SourceTag Binary2SourceTag(const std::string& serialization);
 
@@ -365,15 +363,6 @@ class UI_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) {
                  size_t data_len);
 
   void WriteSourceTag(SourceTag tag);
-
-  enum TrackedAction {
-    WRITE_CLIPBOARD_NO_SOURCE_TAG,
-    WRITE_CLIPBOARD_SOURCE_TAG,
-    READ_TEXT,
-    MAX_TRACKED_ACTION,
-  };
-
-  void ReportAction(Buffer buffer, TrackedAction action) const;
 #if defined(OS_WIN)
   void WriteBitmapFromHandle(HBITMAP source_hbitmap,
                              const gfx::Size& size);
diff --git a/ui/base/clipboard/clipboard_android.cc b/ui/base/clipboard/clipboard_android.cc
index 16956fe..d178849 100644
--- a/ui/base/clipboard/clipboard_android.cc
+++ b/ui/base/clipboard/clipboard_android.cc
@@ -246,7 +246,6 @@ void Clipboard::ReadAsciiText(Clipboard::Buffer buffer,
                               std::string* result) const {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(buffer, BUFFER_STANDARD);
-  ReportAction(buffer, READ_TEXT);
   *result = g_map.Get().Get(kPlainTextFormat);
 }
 
diff --git a/ui/base/clipboard/clipboard_aurax11.cc b/ui/base/clipboard/clipboard_aurax11.cc
index 291a033..44cbe42 100644
--- a/ui/base/clipboard/clipboard_aurax11.cc
+++ b/ui/base/clipboard/clipboard_aurax11.cc
@@ -961,7 +961,6 @@ void Clipboard::ReadAvailableTypes(Buffer buffer, std::vector<string16>* types,
 
 void Clipboard::ReadText(Buffer buffer, string16* result) const {
   DCHECK(CalledOnValidThread());
-  ReportAction(buffer, READ_TEXT);
 
   scoped_ptr<SelectionData> data(aurax11_details_->RequestAndWaitForTypes(
       buffer, aurax11_details_->GetTextAtoms()));
@@ -973,7 +972,6 @@ void Clipboard::ReadText(Buffer buffer, string16* result) const {
 
 void Clipboard::ReadAsciiText(Buffer buffer, std::string* result) const {
   DCHECK(CalledOnValidThread());
-  ReportAction(buffer, READ_TEXT);
 
   scoped_ptr<SelectionData> data(aurax11_details_->RequestAndWaitForTypes(
       buffer, aurax11_details_->GetTextAtoms()));
@@ -1022,7 +1020,6 @@ void Clipboard::ReadHTML(Buffer buffer,
 
 void Clipboard::ReadRTF(Buffer buffer, std::string* result) const {
   DCHECK(CalledOnValidThread());
-  ReportAction(buffer, READ_TEXT);
 
   scoped_ptr<SelectionData> data(aurax11_details_->RequestAndWaitForTypes(
       buffer, aurax11_details_->GetAtomsForFormat(GetRtfFormatType())));
diff --git a/ui/base/clipboard/clipboard_chromeos.cc b/ui/base/clipboard/clipboard_chromeos.cc
index 4517563..86cffb7 100644
--- a/ui/base/clipboard/clipboard_chromeos.cc
+++ b/ui/base/clipboard/clipboard_chromeos.cc
@@ -543,13 +543,11 @@ void Clipboard::ReadAvailableTypes(Buffer buffer, std::vector<string16>* types,
 
 void Clipboard::ReadText(Buffer buffer, string16* result) const {
   DCHECK(CalledOnValidThread());
-  ReportAction(buffer, READ_TEXT);
   GetClipboard()->ReadText(result);
 }
 
 void Clipboard::ReadAsciiText(Buffer buffer, std::string* result) const {
   DCHECK(CalledOnValidThread());
-  ReportAction(buffer, READ_TEXT);
   GetClipboard()->ReadAsciiText(result);
 }
 
@@ -564,7 +562,6 @@ void Clipboard::ReadHTML(Buffer buffer,
 
 void Clipboard::ReadRTF(Buffer buffer, std::string* result) const {
   DCHECK(CalledOnValidThread());
-  ReportAction(buffer, READ_TEXT);
   GetClipboard()->ReadRTF(result);
 }
 
diff --git a/ui/base/clipboard/clipboard_gtk.cc b/ui/base/clipboard/clipboard_gtk.cc
index 03b45c9..5642653 100644
--- a/ui/base/clipboard/clipboard_gtk.cc
+++ b/ui/base/clipboard/clipboard_gtk.cc
@@ -463,7 +463,6 @@ void Clipboard::ReadAvailableTypes(Clipboard::Buffer buffer,
 
 void Clipboard::ReadText(Clipboard::Buffer buffer, string16* result) const {
   DCHECK(CalledOnValidThread());
-  ReportAction(buffer, READ_TEXT);
   GtkClipboard* clipboard = LookupBackingClipboard(buffer);
   if (clipboard == NULL)
     return;
@@ -482,7 +481,6 @@ void Clipboard::ReadText(Clipboard::Buffer buffer, string16* result) const {
 void Clipboard::ReadAsciiText(Clipboard::Buffer buffer,
                               std::string* result) const {
   DCHECK(CalledOnValidThread());
-  ReportAction(buffer, READ_TEXT);
   GtkClipboard* clipboard = LookupBackingClipboard(buffer);
   if (clipboard == NULL)
     return;
@@ -544,7 +542,6 @@ void Clipboard::ReadHTML(Clipboard::Buffer buffer, string16* markup,
 
 void Clipboard::ReadRTF(Buffer buffer, std::string* result) const {
   DCHECK(CalledOnValidThread());
-  ReportAction(buffer, READ_TEXT);
   ReadData(GetRtfFormatType(), result);
 }
 
diff --git a/ui/base/clipboard/clipboard_mac.mm b/ui/base/clipboard/clipboard_mac.mm
index d1b43e4..1961c7c 100644
--- a/ui/base/clipboard/clipboard_mac.mm
+++ b/ui/base/clipboard/clipboard_mac.mm
@@ -308,7 +308,6 @@ void Clipboard::ReadAvailableTypes(Clipboard::Buffer buffer,
 void Clipboard::ReadText(Clipboard::Buffer buffer, string16* result) const {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(buffer, BUFFER_STANDARD);
-  ReportAction(buffer, READ_TEXT);
   NSPasteboard* pb = GetPasteboard();
   NSString* contents = [pb stringForType:NSStringPboardType];
 
@@ -321,7 +320,6 @@ void Clipboard::ReadAsciiText(Clipboard::Buffer buffer,
                               std::string* result) const {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(buffer, BUFFER_STANDARD);
-  ReportAction(buffer, READ_TEXT);
   NSPasteboard* pb = GetPasteboard();
   NSString* contents = [pb stringForType:NSStringPboardType];
 
@@ -365,7 +363,6 @@ void Clipboard::ReadHTML(Clipboard::Buffer buffer, string16* markup,
 void Clipboard::ReadRTF(Buffer buffer, std::string* result) const {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(buffer, BUFFER_STANDARD);
-  ReportAction(buffer, READ_TEXT);
 
   return ReadData(GetRtfFormatType(), result);
 }
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index 5d863d5..77c90c9 100644
--- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc
@@ -437,7 +437,6 @@ void Clipboard::ReadAvailableTypes(Clipboard::Buffer buffer,
 
 void Clipboard::ReadText(Clipboard::Buffer buffer, string16* result) const {
   DCHECK_EQ(buffer, BUFFER_STANDARD);
-  ReportAction(buffer, READ_TEXT);
   if (!result) {
     NOTREACHED();
     return;
@@ -461,7 +460,6 @@ void Clipboard::ReadText(Clipboard::Buffer buffer, string16* result) const {
 void Clipboard::ReadAsciiText(Clipboard::Buffer buffer,
                               std::string* result) const {
   DCHECK_EQ(buffer, BUFFER_STANDARD);
-  ReportAction(buffer, READ_TEXT);
   if (!result) {
     NOTREACHED();
     return;
@@ -534,7 +532,6 @@ void Clipboard::ReadHTML(Clipboard::Buffer buffer, string16* markup,
 
 void Clipboard::ReadRTF(Buffer buffer, std::string* result) const {
   DCHECK_EQ(buffer, BUFFER_STANDARD);
-  ReportAction(buffer, READ_TEXT);
 
   ReadData(GetRtfFormatType(), result);
 }