Merge 124282 - Disable storing cookies from URLFetchers that run with a profile's cookie jar.

chrome/browser/importer/toolbar_importer.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 #include "chrome/browser/importer/toolbar_importer.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/libxml_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/url_fetcher.h"
 #include "grit/generated_resources.h"
+#include "net/base/load_flags.h"
 
 using content::BrowserThread;
 
 // Toolbar5Importer
 const char Toolbar5Importer::kXmlApiReplyXmlTag[] = "xml_api_reply";
 const char Toolbar5Importer::kBookmarksXmlTag[] = "bookmarks";
 const char Toolbar5Importer::kBookmarkXmlTag[] = "bookmark";
 const char Toolbar5Importer::kTitleXmlTag[] = "title";
 const char Toolbar5Importer::kUrlXmlTag[] = "url";
 const char Toolbar5Importer::kTimestampXmlTag[] = "timestamp";
@@ skipping 174 matching lines @@
   // Retrieve authorization token from the network.
   std::string url_string(kT5AuthorizationTokenUrl);
   url_string.replace(url_string.find(kRandomNumberToken),
                      arraysize(kRandomNumberToken) - 1,
                      random_string);
   GURL url(url_string);
 
   token_fetcher_ = content::URLFetcher::Create(
       url, content::URLFetcher::GET, this);
   token_fetcher_->SetRequestContext(request_context_getter_.get());
+  token_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
   token_fetcher_->Start();
 }
 
 void Toolbar5Importer::GetBookmarkDataFromServer(const std::string& response) {
   if (cancelled()) {
     EndImport();
     return;
   }
 
   state_ = GET_BOOKMARKS;
@@ skipping 14 matching lines @@
                       arraysize(kRandomNumberToken) - 1,
                       random_string);
   conn_string.replace(conn_string.find(kAuthorizationToken),
                       arraysize(kAuthorizationToken) - 1,
                       token);
   GURL url(conn_string);
 
   data_fetcher_ = content::URLFetcher::Create(
       url, content::URLFetcher::GET, this);
   data_fetcher_->SetRequestContext(request_context_getter_.get());
+  data_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
   data_fetcher_->Start();
 }
 
 void Toolbar5Importer::GetBookmarksFromServerDataResponse(
     const std::string& response) {
   if (cancelled()) {
     EndImport();
     return;
   }
 
@@ skipping 296 matching lines @@
 }
 
 void  Toolbar5Importer::AddBookmarksToChrome(
     const std::vector<ProfileWriter::BookmarkEntry>& bookmarks) {
   if (!bookmarks.empty() && !cancelled()) {
     const string16& first_folder_name =
         bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_GOOGLE_TOOLBAR);
     bridge_->AddBookmarks(bookmarks, first_folder_name);
   }
 }