Revert of Make Crashpad use the user data dir, rather than always default location

chrome/install_static/install_util_unittest.cc

 // Copyright 2016 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/install_static/install_util.h"
 
 #include <tuple>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 21 matching lines @@
   EXPECT_FALSE(MatchPattern(L"Foo", L"F*b"));
   EXPECT_TRUE(MatchPattern(L"abcd", L"*c*d"));
   EXPECT_TRUE(MatchPattern(L"abcd", L"*?c*d"));
   EXPECT_FALSE(MatchPattern(L"abcd", L"abcd*efgh"));
   EXPECT_TRUE(MatchPattern(L"foobarabc", L"*bar*"));
 }
 
 // Tests the install_static::GetSwitchValueFromCommandLine function.
 TEST(InstallStaticTest, GetSwitchValueFromCommandLineTest) {
   // Simple case with one switch.
-  std::wstring value =
-      GetSwitchValueFromCommandLine(L"c:\\temp\\bleh.exe --type=bar", L"type");
-  EXPECT_EQ(L"bar", value);
+  std::string value =
+      GetSwitchValueFromCommandLine("c:\\temp\\bleh.exe --type=bar", "type");
+  EXPECT_EQ("bar", value);
 
   // Multiple switches with trailing spaces between them.
   value = GetSwitchValueFromCommandLine(
-      L"c:\\temp\\bleh.exe --type=bar  --abc=def bleh", L"abc");
-  EXPECT_EQ(L"def", value);
+      "c:\\temp\\bleh.exe --type=bar  --abc=def bleh", "abc");
+  EXPECT_EQ("def", value);
 
   // Multiple switches with trailing spaces and tabs between them.
   value = GetSwitchValueFromCommandLine(
-      L"c:\\temp\\bleh.exe --type=bar \t\t\t --abc=def bleh", L"abc");
-  EXPECT_EQ(L"def", value);
+      "c:\\temp\\bleh.exe --type=bar \t\t\t --abc=def bleh", "abc");
+  EXPECT_EQ("def", value);
 
   // Non existent switch.
   value = GetSwitchValueFromCommandLine(
-      L"c:\\temp\\bleh.exe --foo=bar  --abc=def bleh", L"type");
-  EXPECT_EQ(L"", value);
+      "c:\\temp\\bleh.exe --foo=bar  --abc=def bleh", "type");
+  EXPECT_EQ("", value);
 
   // Non existent switch.
-  value = GetSwitchValueFromCommandLine(L"c:\\temp\\bleh.exe", L"type");
-  EXPECT_EQ(L"", value);
+  value = GetSwitchValueFromCommandLine("c:\\temp\\bleh.exe", "type");
+  EXPECT_EQ("", value);
 
   // Non existent switch.
-  value =
-      GetSwitchValueFromCommandLine(L"c:\\temp\\bleh.exe type=bar", L"type");
-  EXPECT_EQ(L"", value);
+  value = GetSwitchValueFromCommandLine("c:\\temp\\bleh.exe type=bar", "type");
+  EXPECT_EQ("", value);
 
   // Trailing spaces after the switch.
   value = GetSwitchValueFromCommandLine(
-      L"c:\\temp\\bleh.exe --type=bar      \t\t", L"type");
-  EXPECT_EQ(L"bar", value);
+      "c:\\temp\\bleh.exe --type=bar      \t\t", "type");
+  EXPECT_EQ("bar", value);
 
   // Multiple switches with trailing spaces and tabs between them.
   value = GetSwitchValueFromCommandLine(
-      L"c:\\temp\\bleh.exe --type=bar      \t\t --foo=bleh", L"foo");
-  EXPECT_EQ(L"bleh", value);
+      "c:\\temp\\bleh.exe --type=bar      \t\t --foo=bleh", "foo");
+  EXPECT_EQ("bleh", value);
 
   // Nothing after a switch.
-  value = GetSwitchValueFromCommandLine(L"c:\\temp\\bleh.exe --type=", L"type");
+  value = GetSwitchValueFromCommandLine("c:\\temp\\bleh.exe --type=", "type");
   EXPECT_TRUE(value.empty());
 
   // Whitespace after a switch.
-  value =
-      GetSwitchValueFromCommandLine(L"c:\\temp\\bleh.exe --type= ", L"type");
+  value = GetSwitchValueFromCommandLine("c:\\temp\\bleh.exe --type= ", "type");
   EXPECT_TRUE(value.empty());
 
   // Just tabs after a switch.
-  value = GetSwitchValueFromCommandLine(L"c:\\temp\\bleh.exe --type=\t\t\t",
-                                        L"type");
+  value = GetSwitchValueFromCommandLine("c:\\temp\\bleh.exe --type=\t\t\t",
+      "type");
   EXPECT_TRUE(value.empty());
 
   // Whitespace after the "=" before the value.
-  value =
-      GetSwitchValueFromCommandLine(L"c:\\temp\\bleh.exe --type= bar", L"type");
-  EXPECT_EQ(L"bar", value);
+  value = GetSwitchValueFromCommandLine("c:\\temp\\bleh.exe --type= bar",
+      "type");
+  EXPECT_EQ("bar", value);
 
   // Tabs after the "=" before the value.
-  value = GetSwitchValueFromCommandLine(L"c:\\temp\\bleh.exe --type=\t\t\tbar",
-                                        L"type");
-  EXPECT_EQ(value, L"bar");
+  value = GetSwitchValueFromCommandLine("c:\\temp\\bleh.exe --type=\t\t\tbar",
+      "type");
+  EXPECT_EQ(value, "bar");
 }
 
 TEST(InstallStaticTest, BrowserProcessTest) {
   EXPECT_EQ(ProcessType::UNINITIALIZED, g_process_type);
   InitializeProcessType();
   EXPECT_FALSE(IsNonBrowserProcess());
 }
 
 class InstallStaticUtilTest
     : public ::testing::TestWithParam<
@@ skipping 157 matching lines @@
   std::wstring expected = default_channel();
   if (multi_install()) {
     if (expected.empty())
       expected = L"m";
     else
       expected += L"-m";
   }
   EXPECT_EQ(expected, GetChromeChannelName(true));
 }
 
+TEST_P(InstallStaticUtilTest, GetDefaultUserDataDirectory) {
+  std::wstring user_data_directory;
+  ASSERT_TRUE(GetDefaultUserDataDirectory(&user_data_directory));
+}
+
 #if defined(GOOGLE_CHROME_BUILD)
 // Stable supports multi-install at user and system levels.
 INSTANTIATE_TEST_CASE_P(Stable,
                         InstallStaticUtilTest,
                         testing::Combine(testing::Values(STABLE_INDEX),
                                          testing::Values("user", "system"),
                                          testing::Values("single", "multi")));
 // Canary is single-only at user level.
 INSTANTIATE_TEST_CASE_P(Canary,
                         InstallStaticUtilTest,
                         testing::Combine(testing::Values(CANARY_INDEX),
                                          testing::Values("user"),
                                          testing::Values("single")));
 #else   // GOOGLE_CHROME_BUILD
 // Chromium supports multi-install at user and system levels.
 INSTANTIATE_TEST_CASE_P(Chromium,
                         InstallStaticUtilTest,
                         testing::Combine(testing::Values(CHROMIUM_INDEX),
                                          testing::Values("user", "system"),
                                          testing::Values("single", "multi")));
 #endif  // !GOOGLE_CHROME_BUILD
 
 }  // namespace install_static