Revert 183123

content/browser/browser_context.cc

 // Copyright (c) 2012 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 "content/public/browser/browser_context.h"
 
 #if !defined(OS_IOS)
 #include "base/path_service.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/dom_storage/dom_storage_context_impl.h"
 #include "content/browser/download/download_manager_impl.h"
 #include "content/browser/in_process_webkit/indexed_db_context_impl.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/public/browser/site_instance.h"
 #include "content/browser/storage_partition_impl.h"
 #include "content/browser/storage_partition_impl_map.h"
 #include "content/common/child_process_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "net/base/server_bound_cert_service.h"
 #include "net/base/server_bound_cert_store.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_store.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "ui/base/clipboard/clipboard.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/fileapi/external_mount_points.h"
 #endif // !OS_IOS
 
 using base::UserDataAdapter;
 
 namespace content {
 
 // Only ~BrowserContext() is needed on iOS.
 #if !defined(OS_IOS)
 namespace {
 
 // Key names on BrowserContext.
-const char kClipboardDestroyerKey[] = "clipboard_destroyer";
 const char kDownloadManagerKeyName[] = "download_manager";
 const char kMountPointsKey[] = "mount_points";
 const char kStorageParitionMapKeyName[] = "content_storage_partition_map";
 
 StoragePartitionImplMap* GetStoragePartitionMap(
     BrowserContext* browser_context) {
   StoragePartitionImplMap* partition_map =
       static_cast<StoragePartitionImplMap*>(
           browser_context->GetUserData(kStorageParitionMapKeyName));
   if (!partition_map) {
@@ skipping 36 matching lines @@
 
 void SaveSessionStateOnWebkitThread(
     scoped_refptr<IndexedDBContextImpl> indexed_db_context) {
   indexed_db_context->SetForceKeepSessionState();
 }
 
 void PurgeMemoryOnIOThread(appcache::AppCacheService* appcache_service) {
   appcache_service->PurgeMemory();
 }
 
-// OffTheRecordClipboardDestroyer is supposed to clear the clipboard in
-// destructor if current clipboard content came from corresponding OffTheRecord
-// browser context.
-class OffTheRecordClipboardDestroyer : public base::SupportsUserData::Data {
- public:
-  virtual ~OffTheRecordClipboardDestroyer() {
-    ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-    ExamineClipboard(clipboard, ui::Clipboard::BUFFER_STANDARD);
-    if (ui::Clipboard::IsValidBuffer(ui::Clipboard::BUFFER_SELECTION))
-      ExamineClipboard(clipboard, ui::Clipboard::BUFFER_SELECTION);
-  }
-
-  ui::Clipboard::SourceTag GetAsSourceTag() {
-    return ui::Clipboard::SourceTag(this);
-  }
-
- private:
-  void ExamineClipboard(ui::Clipboard* clipboard,
-                        ui::Clipboard::Buffer buffer) {
-    ui::Clipboard::SourceTag source_tag = clipboard->ReadSourceTag(buffer);
-    if (source_tag == ui::Clipboard::SourceTag(this))
-      clipboard->Clear(buffer);
-  }
-};
-
-// Returns existing OffTheRecordClipboardDestroyer or creates one.
-OffTheRecordClipboardDestroyer* GetClipboardDestroyerForBrowserContext(
-    BrowserContext* context) {
-  if (base::SupportsUserData::Data* data = context->GetUserData(
-          kClipboardDestroyerKey))
-    return static_cast<OffTheRecordClipboardDestroyer*>(data);
-  OffTheRecordClipboardDestroyer* data = new OffTheRecordClipboardDestroyer;
-  context->SetUserData(kClipboardDestroyerKey, data);
-  return data;
-}
-
 }  // namespace
 
 // static
 void BrowserContext::AsyncObliterateStoragePartition(
     BrowserContext* browser_context,
     const GURL& site,
     const base::Closure& on_gc_required) {
   GetStoragePartitionMap(browser_context)->AsyncObliterate(site,
                                                            on_gc_required);
 }
@@ skipping 161 matching lines @@
         BrowserThread::IO, FROM_HERE,
         base::Bind(
             &PurgeMemoryOnIOThread,
             BrowserContext::GetDefaultStoragePartition(browser_context)->
                 GetAppCacheService()));
   }
 
   ForEachStoragePartition(browser_context,
                           base::Bind(&PurgeDOMStorageContextInPartition));
 }
-
-ui::Clipboard::SourceTag BrowserContext::GetMarkerForOffTheRecordContext(
-    BrowserContext* context) {
-  if (context && context->IsOffTheRecord()) {
-    OffTheRecordClipboardDestroyer* clipboard_destroyer =
-        GetClipboardDestroyerForBrowserContext(context);
-
-    return clipboard_destroyer->GetAsSourceTag();
-  }
-  return ui::Clipboard::SourceTag();
-}
 #endif  // !OS_IOS
 
 BrowserContext::~BrowserContext() {
 #if !defined(OS_IOS)
   if (GetUserData(kDownloadManagerKeyName))
     GetDownloadManager(this)->Shutdown();
 #endif
 }
 
 }  // namespace content