Delete both regular and Metro user data dirs on uninstall.

chrome/installer/util/product_unittest.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/installer/util/product_unittest.h"
 
 #include "base/logging.h"
 #include "base/test/test_reg_util_win.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/common/chrome_constants.h"
 #include "chrome/installer/util/chrome_frame_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/installation_state.h"
 #include "chrome/installer/util/installer_state.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/product.h"
 
 using base::win::RegKey;
 using installer::Product;
 using installer::MasterPreferences;
@@ skipping 43 matching lines @@
   installer::MasterPreferences prefs(cmd_line);
   installer::InstallationState machine_state;
   machine_state.Initialize();
   installer::InstallerState installer_state;
   installer_state.Initialize(cmd_line, prefs, machine_state);
 
   const Product* product = installer_state.products()[0];
   BrowserDistribution* distribution = product->distribution();
   EXPECT_EQ(BrowserDistribution::CHROME_BROWSER, distribution->GetType());
 
-  FilePath user_data(product->GetUserDataPath());
-  EXPECT_FALSE(user_data.empty());
+  std::vector<FilePath> user_data_paths;
+  product->GetUserDataPaths(&user_data_paths);
+  EXPECT_LE(static_cast<size_t>(1), user_data_paths.size());

[gab, 2012/08/03 17:54:20]

In comparisons don't we usually put the constant on the RHS of the equation?

[grt (UTC plus 2), 2012/08/03 20:18:37]

I'm following the pattern of EXPECT_EQ; see
http://code.google.com/p/googletest/wiki/Primer#Binary_Comparison.

[gab, 2012/08/03 21:58:57]

Yea I realize that, it makes sense for me to do it this way for EXPECT_EQ, but
for EXPECT_LE I feel it's like EXPECT_TRUE(val1 < val2) in which case I feel
val2 should be the constant hence my proposal.

I don't feel strongly about it though so... optional :)!

+  const FilePath& user_data = user_data_paths[0];
+  EXPECT_FALSE(user_data_paths[0].empty());
   EXPECT_NE(std::wstring::npos,
-            user_data.value().find(installer::kInstallUserDataDir));
+            user_data_paths[0].value().find(installer::kInstallUserDataDir));
+  if (user_data_paths.size() > 1) {
+    EXPECT_FALSE(user_data_paths[1].empty());
+    EXPECT_NE(
+        std::wstring::npos,
+        user_data_paths[1].value().find(chrome::kMetroChromeUserDataSubDir));
+  }
 
   FilePath program_files;
   PathService::Get(base::DIR_PROGRAM_FILES, &program_files);
   // The User Data path should never be under program files, even though
   // system_level is true.
   EXPECT_EQ(std::wstring::npos,
             user_data.value().find(program_files.value()));
 
   // There should be no installed version in the registry.
   machine_state.Initialize();
@@ skipping 40 matching lines @@
     if (chrome_state != NULL)
       EXPECT_TRUE(chrome_state->is_msi());
   }
 }
 
 TEST_F(ProductTest, LaunchChrome) {
   // TODO(tommi): Test Product::LaunchChrome and
   // Product::LaunchChromeAndWait.
   LOG(ERROR) << "Test not implemented.";
 }