Makes a handful of DataSources not replace the existing

chrome/browser/sessions/session_restore_uitest.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 "base/command_line.h"
 #include "base/file_path.h"
 #include "base/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 432 matching lines @@
 
   ASSERT_EQ(url1_, GetActiveTabURL());
 }
 
 // Make sure after a restore the number of processes matches that of the number
 // of processes running before the restore. This creates a new tab so that
 // we should have two new tabs running.  (This test will pass in both
 // process-per-site and process-per-site-instance, because we treat the new tab
 // as a special case in process-per-site-instance so that it only ever uses one
 // process.)
-//
-// Flaky: http://code.google.com/p/chromium/issues/detail?id=52022
-TEST_F(SessionRestoreUITest, FLAKY_ShareProcessesOnRestore) {
+TEST_F(SessionRestoreUITest, ShareProcessesOnRestore) {

[Evan Martin, 2011/02/23 00:17:32]

Did you mean to include this?

[sky, 2011/02/23 00:38:57]

Yes. All the changes I've done to ChromeURLDataManager (and URLRequest,
ProcessIterator, process launcher and automation classes) are so this test isn't
flakey! Yowza!

   if (ProxyLauncher::in_process_renderer()) {
     // No point in running this test in single process mode.
     return;
   }
 
   scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser_proxy.get() != NULL);
   int tab_count;
   ASSERT_TRUE(browser_proxy->GetTabCount(&tab_count));
 
@@ skipping 25 matching lines @@
     ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(
                     TestTimeouts::action_max_timeout_ms()));
   }
 
   int process_count = 0;
   ASSERT_TRUE(GetBrowserProcessCount(&process_count));
   ASSERT_EQ(expected_process_count, process_count);
 }
 
 }  // namespace