Reset the user data dir in android_browsertests for each test.

Without this, state persists between tests, which of course causes
failures.

R=sky@chromium.org

Bug: 961849
Change-Id: Ie74936ebfed4bacfa721dcba446905f4fe770faa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1677591
Commit-Queue: danakj <danakj@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#672669}

chrome/test/base/android/android_browser_test.cc

@@ -4,6 +4,7 @@
 
 #include "chrome/test/base/android/android_browser_test.h"
 
+#include "base/command_line.h"
 #include "chrome/browser/ui/android/tab_model/tab_model.h"
 #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
 #include "chrome/test/base/test_launcher_utils.h"
@@ -16,6 +17,7 @@ void AndroidBrowserTest::SetUp() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   SetUpCommandLine(command_line);
   SetUpDefaultCommandLine(command_line);
+  ASSERT_TRUE(test_launcher_utils::CreateUserDataDir(&temp_user_data_dir_));
 
   BrowserTestBase::SetUp();
 }

chrome/test/base/android/android_browser_test.h

@@ -5,6 +5,9 @@
 #ifndef CHROME_TEST_BASE_ANDROID_ANDROID_BROWSER_TEST_H_
 #define CHROME_TEST_BASE_ANDROID_ANDROID_BROWSER_TEST_H_
 
+#include "base/macros.h"
+#include "base/files/scoped_temp_dir.h"
+#include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_base.h"
 
 class AndroidBrowserTest : public content::BrowserTestBase {
@@ -23,6 +26,13 @@ class AndroidBrowserTest : public content::BrowserTestBase {
   void SetUp() override;
   void PreRunTestOnMainThread() override;
   void PostRunTestOnMainThread() override;
+
+ private:
+  // Temporary user data directory. Used only when a user data directory is not
+  // specified in the command line.
+  base::ScopedTempDir temp_user_data_dir_;
+
+  DISALLOW_COPY_AND_ASSIGN(AndroidBrowserTest);
 };
 
 #endif  // CHROME_TEST_BASE_ANDROID_ANDROID_BROWSER_TEST_H_

chrome/test/base/in_process_browser_test.cc

@@ -212,7 +212,7 @@ void InProcessBrowserTest::SetUp() {
   SetUpDefaultCommandLine(command_line);
 
   // Create a temporary user data directory if required.
-  ASSERT_TRUE(CreateUserDataDirectory())
+  ASSERT_TRUE(test_launcher_utils::CreateUserDataDir(&temp_user_data_dir_))
       << "Could not create user data directory.";
 
   // Allow subclasses the opportunity to make changes to the default user data
@@ -312,23 +312,6 @@ void InProcessBrowserTest::SetUpDefaultCommandLine(
     command_line->AppendSwitch(switches::kDisableZeroBrowsersOpenForTests);
 }
 
-bool InProcessBrowserTest::CreateUserDataDirectory() {
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  base::FilePath user_data_dir =
-      command_line->GetSwitchValuePath(switches::kUserDataDir);
-  if (user_data_dir.empty()) {
-    if (temp_user_data_dir_.CreateUniqueTempDir() &&
-        temp_user_data_dir_.IsValid()) {
-      user_data_dir = temp_user_data_dir_.GetPath();
-    } else {
-      LOG(ERROR) << "Could not create temporary user data directory \""
-                 << temp_user_data_dir_.GetPath().value() << "\".";
-      return false;
-    }
-  }
-  return test_launcher_utils::OverrideUserDataDir(user_data_dir);
-}
-
 void InProcessBrowserTest::TearDown() {
   DCHECK(!g_browser_process);
 #if defined(OS_WIN)

chrome/test/base/in_process_browser_test.h

@@ -258,10 +258,6 @@ class InProcessBrowserTest : public content::BrowserTestBase {
  private:
   void Initialize();
 
-  // Creates a user data directory for the test if one is needed. Returns true
-  // if successful.
-  virtual bool CreateUserDataDirectory() WARN_UNUSED_RESULT;
-
   // Quits all open browsers and waits until there are no more browsers.
   void QuitBrowsers();
 

chrome/test/base/test_launcher_utils.cc

@@ -9,6 +9,7 @@
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/feature_list.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
@@ -93,6 +94,23 @@ void RemoveCommandLineSwitch(const base::CommandLine& in_command_line,
   }
 }
 
+bool CreateUserDataDir(base::ScopedTempDir* temp_dir) {
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  base::FilePath user_data_dir =
+      command_line->GetSwitchValuePath(switches::kUserDataDir);
+  if (user_data_dir.empty()) {
+    DCHECK(temp_dir);
+    if (temp_dir->CreateUniqueTempDir() && temp_dir->IsValid()) {
+      user_data_dir = temp_dir->GetPath();
+    } else {
+      LOG(ERROR) << "Could not create temporary user data directory \""
+                 << temp_dir->GetPath().value() << "\".";
+      return false;
+    }
+  }
+  return OverrideUserDataDir(user_data_dir);
+}
+
 bool OverrideUserDataDir(const base::FilePath& user_data_dir) {
   bool success = true;
 

chrome/test/base/test_launcher_utils.h

@@ -12,6 +12,7 @@
 
 namespace base {
 class CommandLine;
+class ScopedTempDir;
 }
 
 // A set of utilities for test code that launches separate processes.
@@ -34,9 +35,12 @@ void RemoveCommandLineSwitch(const base::CommandLine& in_command_line,
                              const std::string& switch_to_remove,
                              base::CommandLine* out_command_line);
 
+// Creates and overrides the current process' user data dir.
+bool CreateUserDataDir(base::ScopedTempDir* temp_dir) WARN_UNUSED_RESULT;
+
 // Overrides the current process' user data dir.
-bool OverrideUserDataDir(
-    const base::FilePath& user_data_dir) WARN_UNUSED_RESULT;
+bool OverrideUserDataDir(const base::FilePath& user_data_dir)
+    WARN_UNUSED_RESULT;
 
 }  // namespace test_launcher_utils