Merge LocalSharedObjectsContainer with LocalSharedObjectsCounter

chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h"
 
 #include <vector>
 
 #include "base/mac/bundle_locations.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
+#include "chrome/browser/content_settings/local_shared_objects_container.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"
 #import "chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.h"
 #import "chrome/browser/ui/cocoa/vertical_gradient_view.h"
 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
@@ skipping 322 matching lines @@
     [self setBlockedCookiesButtonsEnabled:NO];
   }
 }
 
 // Initializes the |allowedTreeModel_| and |blockedTreeModel_|, and builds
 // the |cocoaAllowedTreeModel_| and |cocoaBlockedTreeModel_|.
 - (void)loadTreeModelFromWebContents {
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(webContents_);
 
-  allowedTreeModel_ = content_settings->CreateAllowedCookiesTreeModel();
-  blockedTreeModel_ = content_settings->CreateBlockedCookiesTreeModel();
+  allowedTreeModel_ =
+      content_settings->allowed_local_shared_objects().CreateCookiesTreeModel();
+
+  blockedTreeModel_ =
+      content_settings->blocked_local_shared_objects().CreateCookiesTreeModel();
 
   // Convert the model's icons from Skia to Cocoa.
   std::vector<gfx::ImageSkia> skiaIcons;
   allowedTreeModel_->GetIcons(&skiaIcons);
   icons_.reset([[NSMutableArray alloc] init]);
   for (std::vector<gfx::ImageSkia>::iterator it = skiaIcons.begin();
        it != skiaIcons.end(); ++it) {
     [icons_ addObject:gfx::NSImageFromImageSkia(*it)];
   }
 
@@ skipping 138 matching lines @@
       treeController = blockedTreeController_;
       break;
     default:
       NOTREACHED();
       return;
   }
   [detailsViewController_ configureBindingsForTreeController:treeController];
 }
 
 @end