Changes to support new cookie policy....

chrome/browser/cocoa/preferences_window_controller.mm

 // Copyright (c) 2009 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/cocoa/preferences_window_controller.h"
 
 #include <algorithm>
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
 #include "base/logging.h"
@@ skipping 27 matching lines @@
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
 #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"
 
 namespace {
 
 std::string GetNewTabUIURLString() {
   return URLFixerUpper::FixupURL(chrome::kChromeUINewTabURL, std::string());
 }
 
 // Helper to remove all but the last view from the view heirarchy.
@@ skipping 1405 matching lines @@
   metricsRecording_.SetValue(enabled);
 }
 
 // Returns the index of the cookie popup based on the preference.
 - (NSInteger)cookieBehavior {
   return cookieBehavior_.GetValue();
 }
 
 // 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 {
   NSString* pathString =
       base::SysWideToNSString(defaultDownloadLocation_.GetValue());
   return [NSURL fileURLWithPath:pathString];
 }
 
 - (BOOL)askForSaveLocation {
   return askForSaveLocation_.GetValue();
@@ skipping 314 matching lines @@
     case OPTIONS_PAGE_ADVANCED:
       return underTheHoodView_;
     case OPTIONS_PAGE_DEFAULT:
     case OPTIONS_PAGE_COUNT:
       LOG(DFATAL) << "Invalid page value " << page;
   }
   return basicsView_;
 }
 
 @end