Revert of Fix for URL opening code

chrome/browser/sessions/session_restore_browsertest.cc

 // Copyright 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 <stddef.h>
 
-#include <algorithm>
 #include <set>
 #include <vector>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/memory/memory_pressure_listener.h"
 #include "base/memory/ptr_util.h"
@@ skipping 187 matching lines @@
       contents->GetController().LoadIfNecessary();
       content::WaitForLoadStop(contents);
     }
   }
 
   GURL url1_;
   GURL url2_;
   GURL url3_;
 
   const BrowserList* active_browser_list_;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(SessionRestoreTest);
 };
 
 // Activates the smart restore behaviour and tracks the loading of tabs.
 class SmartSessionRestoreTest : public SessionRestoreTest,
                                       public content::NotificationObserver {
  public:
   SmartSessionRestoreTest() {}
   void StartObserving(size_t num_tabs) {
     // Start by clearing everything so it can be reused in the same test.
     web_contents_.clear();
@@ skipping 1391 matching lines @@
   // automatically at the start of the test.
   for (size_t i = 1; i < web_contents().size(); i++) {
     GURL expected_url = GURL(kUrls[activation_order[kExpectedNumTabs - i]]);
     ASSERT_EQ(expected_url, web_contents()[i]->GetLastCommittedURL());
     if (i > 0) {
       ASSERT_GT(web_contents()[i - 1]->GetLastActiveTime(),
                 web_contents()[i]->GetLastActiveTime());
     }
   }
 }
-
-namespace {
-
-const char kStartupURL[] = "http://example.com/";
-const char kSessionURL[] = "http://localhost/";
-
-}  // namespace
-
-class SessionRestoreWithStartupURLTest : public SessionRestoreTest {
- public:
-  SessionRestoreWithStartupURLTest() {}
-
- protected:
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    // Add startup URL to command line, but only in main test body in order
-    // to prevent that URL from beng opened twice.
-    if (!base::StartsWith(
-            testing::UnitTest::GetInstance()->current_test_info()->name(),
-            "PRE_", base::CompareCase::SENSITIVE)) {
-      command_line->AppendArg(kStartupURL);
-    }
-    SessionRestoreTest::SetUpCommandLine(command_line);
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(SessionRestoreWithStartupURLTest);
-};
-
-IN_PROC_BROWSER_TEST_F(SessionRestoreWithStartupURLTest,
-                       PRE_StartupURLsWithSessionRestore) {
-  // Prepare a session to restore in main test body.
-  ui_test_utils::NavigateToURL(browser(), GURL(kSessionURL));
-}
-
-IN_PROC_BROWSER_TEST_F(SessionRestoreWithStartupURLTest,
-                       StartupURLsWithSessionRestore) {
-  // Check that browser is started with restored session and
-  // tab with startup URL next to it.
-  TabStripModel* tab_strip = browser()->tab_strip_model();
-  ASSERT_EQ(2, tab_strip->count());
-  EXPECT_EQ(kSessionURL,
-            tab_strip->GetWebContentsAt(0)->GetURL().possibly_invalid_spec());
-  EXPECT_EQ(kStartupURL,
-            tab_strip->GetWebContentsAt(1)->GetURL().possibly_invalid_spec());
-}