Changes to support new cookie policy....

chrome/browser/cocoa/preferences_window_controller.mm

Index: chrome/browser/cocoa/preferences_window_controller.mm
===================================================================
--- chrome/browser/cocoa/preferences_window_controller.mm	(revision 37613)
+++ chrome/browser/cocoa/preferences_window_controller.mm	(working copy)
@@ -45,7 +45,6 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "net/base/cookie_policy.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 
@@ -1471,17 +1470,7 @@
 
 // Sets the backend pref for whether or not to accept cookies based on |index|.
 - (void)setCookieBehavior:(NSInteger)index {
-  net::CookiePolicy::Type policy = net::CookiePolicy::ALLOW_ALL_COOKIES;
-  if (net::CookiePolicy::ValidType(index))
-    policy = net::CookiePolicy::FromInt(index);
-  const char* kUserMetrics[] = {
-      "Options_AllowAllCookies",
-      "Options_BlockThirdPartyCookies",
-      "Options_BlockAllCookies"
-  };
-  DCHECK(policy >= 0 && (unsigned int)policy < arraysize(kUserMetrics));
-  [self recordUserAction:kUserMetrics[policy]];
-  cookieBehavior_.SetValue(policy);
+  // TODO(darin): Remove everything else related to this setter.
 }
 
 - (NSURL*)defaultDownloadLocation {