Re-land http://codereview.chromium.org/7831056/ and http://codereview.chromium.org/7833042/ .

chrome/browser/ui/webui/ntp/new_tab_page_sync_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/ntp/new_tab_page_sync_handler.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "grit/generated_resources.h"
 #include "net/base/cookie_monster.h"
 #include "net/url_request/url_request_context.h"
 #include "ui/base/l10n/l10n_util.h"
 
 // Default URL for the sync web interface.
 //
 // TODO(idana): when we figure out how we are going to allow third parties to
 // plug in their own sync engine, we should allow this value to be
 // configurable.
 static const char kSyncDefaultViewOnlineUrl[] = "http://docs.google.com";
 
-// TODO(idana): the following code was originally copied from
-// toolbar_importer.h/cc and it needs to be moved to a common Google Accounts
-// utility.
-
-// A simple pair of fields that identify a set of Google cookies, used to
-// filter from a larger set.
-struct GoogleCookieFilter {
-  // The generalized, fully qualified URL of pages where
-  // cookies with id |cookie_id| are obtained / accessed.
-  const char* url;
-  // The id of the cookie this filter is selecting,
-  // with name/value delimiter (i.e '=').
-  const char* cookie_id;
-};
-
-// Filters to select Google GAIA cookies.
-static const GoogleCookieFilter kGAIACookieFilters[] = {
-  { "http://.google.com/",       "SID=" },     // Gmail.
-  // Add filters here for other interesting cookies that should result in
-  // showing the promotions (e.g ASIDAS for dasher accounts).
-};
-
-bool IsGoogleGAIACookieInstalled() {
-  for (size_t i = 0; i < arraysize(kGAIACookieFilters); ++i) {
-    // Since we are running on the UI thread don't call GetURLRequestContext().
-    net::CookieStore* store =
-        Profile::Deprecated::GetDefaultRequestContext()->
-        DONTUSEME_GetCookieStore();
-    GURL url(kGAIACookieFilters[i].url);
-    net::CookieOptions options;
-    options.set_include_httponly();  // The SID cookie might be httponly.
-    std::string cookies = store->GetCookiesWithOptions(url, options);
-    std::vector<std::string> cookie_list;
-    base::SplitString(cookies, ';', &cookie_list);
-    for (std::vector<std::string>::iterator current = cookie_list.begin();
-         current != cookie_list.end();
-         ++current) {
-      size_t position =
-          current->find(kGAIACookieFilters[i].cookie_id);
-      if (0 == position)
-        return true;
-    }
-  }
-  return false;
-}
-
 NewTabPageSyncHandler::NewTabPageSyncHandler() : sync_service_(NULL),
   waiting_for_initial_page_load_(true) {
 }
 
 NewTabPageSyncHandler::~NewTabPageSyncHandler() {
   if (sync_service_)
     sync_service_->RemoveObserver(this);
 }
 
 // static
@@ skipping 127 matching lines @@
       if (linkurl.empty()) {
         value.SetBoolean("linkurlisset", false);
       } else {
         value.SetBoolean("linkurlisset", true);
         value.SetString("linkurl", linkurl);
       }
     }
   }
   web_ui_->CallJavascriptFunction("syncMessageChanged", value);
 }