Revert 90421 - Adds --enable-sync-oauth, enabling INFO logging of oauth_token cookies

chrome/browser/sync/profile_sync_service.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/sync/profile_sync_service.h"
 
 #include <stddef.h>
 #include <map>
 #include <ostream>
 #include <set>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "base/task.h"
 #include "base/threading/thread_restrictions.h"
-#include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/backend_migrator.h"
 #include "chrome/browser/sync/engine/configure_reason.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/change_processor.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/data_type_manager.h"
 #include "chrome/browser/sync/glue/session_data_type_controller.h"
 #include "chrome/browser/sync/js_arg_list.h"
 #include "chrome/browser/sync/js_event_details.h"
 #include "chrome/browser/sync/profile_sync_factory.h"
 #include "chrome/browser/sync/signin_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/url_constants.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "content/common/notification_type.h"
 #include "grit/generated_resources.h"
-#include "net/base/cookie_monster.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using browser_sync::ChangeProcessor;
 using browser_sync::DataTypeController;
 using browser_sync::DataTypeManager;
 using browser_sync::SyncBackendHost;
 using sync_api::SyncCredentials;
 
 typedef GoogleServiceAuthError AuthError;
 
@@ skipping 106 matching lines @@
                  Source<TokenService>(profile_->GetTokenService()));
   registrar_.Add(this,
                  NotificationType::TOKEN_LOADING_FINISHED,
                  Source<TokenService>(profile_->GetTokenService()));
   registrar_.Add(this,
                  NotificationType::GOOGLE_SIGNIN_SUCCESSFUL,
                  Source<Profile>(profile_));
   registrar_.Add(this,
                  NotificationType::GOOGLE_SIGNIN_FAILED,
                  Source<Profile>(profile_));
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableSyncOAuth)) {
-    registrar_.Add(this,
-                   NotificationType::COOKIE_CHANGED,
-                   Source<Profile>(profile_));
-  }
 }
 
 void ProfileSyncService::RegisterDataTypeController(
     DataTypeController* data_type_controller) {
   DCHECK_EQ(data_type_controllers_.count(data_type_controller->type()), 0U);
   data_type_controllers_[data_type_controller->type()] =
       data_type_controller;
 }
 
 browser_sync::SessionModelAssociator*
@@ skipping 366 matching lines @@
     ConfigureDataTypeManager();
   } else if (SetupInProgress()) {
     wizard_.Step(SyncSetupWizard::SYNC_EVERYTHING);
   } else {
     // This should only be hit during integration tests, but there's no good
     // way to assert this.
     DVLOG(1) << "Setup not complete, no wizard - integration tests?";
   }
 }
 
-namespace {
-const char* CauseName(net::CookieMonster::Delegate::ChangeCause cause) {
-  switch (cause) {
-    case net::CookieMonster::Delegate::CHANGE_COOKIE_EXPLICIT:
-      return "CHANGE_COOKIE_EXPLICIT";
-    case net::CookieMonster::Delegate::CHANGE_COOKIE_OVERWRITE:
-      return "CHANGE_COOKIE_OVERWRITE";
-    case net::CookieMonster::Delegate::CHANGE_COOKIE_EXPIRED:
-      return "CHANGE_COOKIE_EXPIRED";
-    case net::CookieMonster::Delegate::CHANGE_COOKIE_EVICTED:
-      return "CHANGE_COOKIE_EVICTED";
-    case net::CookieMonster::Delegate::CHANGE_COOKIE_EXPIRED_OVERWRITE:
-      return "CHANGE_COOKIE_EXPIRED_OVERWRITE";
-    default:
-      return "<unknown>";
-  }
-}
-}
-
-void ProfileSyncService::OnCookieChanged(Profile* profile,
-                                         ChromeCookieDetails* cookie_details) {
-  const net::CookieMonster::CanonicalCookie* canonical_cookie =
-      cookie_details->cookie;
-  if (canonical_cookie->Name() == "oauth_token") {
-    net::CookieMonster::Delegate::ChangeCause cause = cookie_details->cause;
-    LOG(INFO) << "COOKIE_CHANGED: removed="
-              << (cookie_details->removed ? "true" : "false")
-              << ", cause=" << CauseName(cause)
-              << ", Source=" << canonical_cookie->Source()
-              << ", Name=" << canonical_cookie->Name()
-              << ", Value=" << canonical_cookie->Value()
-              << ", Domain=" << canonical_cookie->Domain()
-              << ", Path=" << canonical_cookie->Path()
-              << ", DoesExpire="
-              << (canonical_cookie->DoesExpire() ? "true" : "false")
-              << ", IsPersistent="
-              << (canonical_cookie->IsPersistent() ? "true" : "false")
-              << ", IsSecure="
-              << (canonical_cookie->IsSecure() ? "true" : "false")
-              << ", IsHttpOnly="
-              << (canonical_cookie->IsHttpOnly() ? "true" : "false")
-              << ", IsDomainCookie="
-              << (canonical_cookie->IsDomainCookie() ? "true" : "false")
-              << ", IsHostCookie="
-              << (canonical_cookie->IsHostCookie() ? "true" : "false")
-              << ", IsExpired="
-              << (const_cast<net::CookieMonster::CanonicalCookie*>(
-                      canonical_cookie)->IsExpired(
-                          base::Time::NowFromSystemTime())
-                  ? "true" : "false");
-  }
-}
-
 void ProfileSyncService::OnSyncCycleCompleted() {
   UpdateLastSyncedTime();
   VLOG(2) << "Notifying observers sync cycle completed";
   NotifyObservers();
 }
 
 void ProfileSyncService::UpdateAuthErrorState(
     const GoogleServiceAuthError& error) {
   last_auth_error_ = error;
   // Protect against the in-your-face dialogs that pop out of nowhere.
@@ skipping 728 matching lines @@
     case NotificationType::TOKEN_LOADING_FINISHED: {
       // If not in Chrome OS, and we have a username without tokens,
       // the user will need to signin again, so sign out.
       if (cros_user_.empty() &&
           !signin_->GetUsername().empty() &&
           !AreCredentialsAvailable()) {
         DisableForUser();
       }
       break;
     }
-    case NotificationType::COOKIE_CHANGED: {
-      OnCookieChanged(Source<Profile>(source).ptr(),
-                      Details<ChromeCookieDetails>(details).ptr());
-      break;
-    }
     default: {
       NOTREACHED();
     }
   }
 }
 
 void ProfileSyncService::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
@@ skipping 30 matching lines @@
   // is initialized, all enabled data types are consistent with one
   // another, and no unrecoverable error has transpired.
   if (unrecoverable_error_detected_)
     return false;
 
   if (!data_type_manager_.get())
     return false;
 
   return data_type_manager_->state() == DataTypeManager::CONFIGURED;
 }