Support Using ScopedFeatureList in BrowserTest

chrome/test/base/test_launcher_utils.cc

 // 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/test/base/test_launcher_utils.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/feature_list.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/os_crypt/os_crypt_switches.h"
 #include "components/safe_browsing/common/safebrowsing_switches.h"
 #include "content/public/common/content_switches.h"
 
 #if defined(USE_AURA)
 #include "ui/wm/core/wm_core_switches.h"
 #endif
 
 namespace test_launcher_utils {
 
 void PrepareBrowserCommandLineForTests(base::CommandLine* command_line) {
-  // Turn off preconnects because they break the brittle python webserver;
-  // see http://crbug.com/60035.
-  command_line->AppendSwitchASCII(switches::kDisableFeatures,
-                                  "NetworkPrediction");
-
   // Don't show the first run ui.
   command_line->AppendSwitch(switches::kNoFirstRun);
 
   // No default browser check, it would create an info-bar (if we are not the
   // default browser) that could conflicts with some tests expectations.
   command_line->AppendSwitch(switches::kNoDefaultBrowserCheck);
 
   // Enable info level logging to stderr by default so that we can see when
   // bad stuff happens, but honor the flags specified from the command line.
   if (!command_line->HasSwitch(switches::kEnableLogging))
@@ skipping 37 matching lines @@
   const base::CommandLine::SwitchMap& switch_map =
       in_command_line.GetSwitches();
   for (base::CommandLine::SwitchMap::const_iterator i = switch_map.begin();
        i != switch_map.end(); ++i) {
     const std::string& switch_name = i->first;
     if (switch_name == switch_to_remove)
       continue;
 
     out_command_line->AppendSwitchNative(switch_name, i->second);
   }
 }

[Ilya Sherman, 2017/06/09 20:19:28]

^^^ looks like what you are trying to implement in the CommandLine changes.

[chaopeng, 2017/06/13 04:16:32]

Yes, we should remove this method after.

 
 bool OverrideUserDataDir(const base::FilePath& user_data_dir) {
   bool success = true;
 
   // PathService::Override() is the best way to change the user data directory.
   // This matches what is done in ChromeMain().
   success = PathService::Override(chrome::DIR_USER_DATA, user_data_dir);
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   // Make sure the cache directory is inside our clear profile. Otherwise
   // the cache may contain data from earlier tests that could break the
   // current test.
   //
   // Note: we use an environment variable here, because we have to pass the
   // value to the child process. This is the simplest way to do it.
   std::unique_ptr<base::Environment> env(base::Environment::Create());
   success = success && env->SetVar("XDG_CACHE_HOME", user_data_dir.value());
 
   // Also make sure that the machine policy directory is inside the clear
   // profile. Otherwise the machine's policies could affect tests.
   base::FilePath policy_files = user_data_dir.AppendASCII("policies");
   success =
       success && PathService::Override(chrome::DIR_POLICY_FILES, policy_files);
 #endif
 
   return success;
 }
 
 }  // namespace test_launcher_utils