Revert 95534 - Creat BrowsingDataCookieHelper and CannedBrowsingDataCookieHelper for logging cook...

chrome/browser/ui/webui/options/cookies_view_handler.cc

 // Copyright (c) 2011 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 "chrome/browser/ui/webui/options/cookies_view_handler.h"
 
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browsing_data_appcache_helper.h"
-#include "chrome/browser/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data_file_system_helper.h"
 #include "chrome/browser/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data_local_storage_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/cookies_tree_model_util.h"
 #include "grit/generated_resources.h"
+#include "net/url_request/url_request_context_getter.h"
 #include "ui/base/l10n/l10n_util.h"
 
 CookiesViewHandler::CookiesViewHandler() : batch_update_(false) {
 }
 
 CookiesViewHandler::~CookiesViewHandler() {
 }
 
 void CookiesViewHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
@@ skipping 108 matching lines @@
   DCHECK(batch_update_);
   batch_update_ = false;
 
   SendChildren(cookies_tree_model_->GetRoot());
 }
 
 void CookiesViewHandler::EnsureCookiesTreeModelCreated() {
   if (!cookies_tree_model_.get()) {
     Profile* profile = web_ui_->GetProfile();
     cookies_tree_model_.reset(new CookiesTreeModel(
-        new BrowsingDataCookieHelper(profile),
+        profile->GetRequestContext()->DONTUSEME_GetCookieStore()->
+            GetCookieMonster(),
         new BrowsingDataDatabaseHelper(profile),
         new BrowsingDataLocalStorageHelper(profile),
         NULL,
         new BrowsingDataAppCacheHelper(profile),
         BrowsingDataIndexedDBHelper::Create(profile),
         BrowsingDataFileSystemHelper::Create(profile),
         false));
     cookies_tree_model_->AddCookiesTreeObserver(this);
   }
 }
@@ skipping 48 matching lines @@
       children);
 
   ListValue args;
   args.Append(parent == cookies_tree_model_->GetRoot() ?
       Value::CreateNullValue() :
       Value::CreateStringValue(cookies_tree_model_util::GetTreeNodeId(parent)));
   args.Append(children);
 
   web_ui_->CallJavascriptFunction("CookiesView.loadChildren", args);
 }