Merge 11613 - Don't leak visited site information from original profile to OT...

chrome/browser/profile.cc

 // Copyright (c) 2006-2008 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/profile.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 123 matching lines @@
 
   virtual Profile* GetOffTheRecordProfile() {
     return this;
   }
 
   virtual Profile* GetOriginalProfile() {
     return profile_;
   }
 
   virtual VisitedLinkMaster* GetVisitedLinkMaster() {
-    return profile_->GetVisitedLinkMaster();
+    // We don't provide access to the VisitedLinkMaster when we're OffTheRecord
+    // because we don't want to leak the sites that the user has visited before.
+    return NULL;
   }
 
   virtual ExtensionsService* GetExtensionsService() {
     return profile_->GetExtensionsService();
   }
 
   virtual UserScriptMaster* GetUserScriptMaster() {
     return profile_->GetUserScriptMaster();
   }
 
@@ skipping 219 matching lines @@
   PrefService* prefs = GetPrefs();
   bool user_scripts_enabled =
       command_line->HasSwitch(switches::kEnableUserScripts) ||
       prefs->GetBoolean(prefs::kEnableUserScripts);
   bool extensions_enabled =
       command_line->HasSwitch(switches::kEnableExtensions) ||
       prefs->GetBoolean(prefs::kEnableExtensions);
 
   FilePath script_dir;
   if (user_scripts_enabled) {
-   
     if (command_line->HasSwitch(switches::kUserScriptsDir)) {
       std::wstring path_string =
           command_line->GetSwitchValue(switches::kUserScriptsDir);
       script_dir = FilePath::FromWStringHack(path_string);
     } else {
       script_dir = GetPath();
       script_dir = script_dir.Append(chrome::kUserScriptsDirname);
     }
   }
 
@@ skipping 474 matching lines @@
 
 #ifdef CHROME_PERSONALIZATION
 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() {
   DCHECK(!Personalization::IsP13NDisabled());
   if (!personalization_.get())
     personalization_.reset(
         Personalization::CreateProfilePersonalization(this));
   return personalization_.get();
 }
 #endif