//chrome/browser and //components F-L: Change ScopedTempDir::path() to GetPath()

chrome/browser/importer/ie_importer_browsertest_win.cc

 // Copyright (c) 2013 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.
 
 // The order of these includes is important.
 #include <windows.h>
 #include <unknwn.h>
 #include <intshcut.h>
 #include <propvarutil.h>
 #include <shlguid.h>
@@ skipping 426 matching lines @@
 
   base::ScopedTempDir temp_dir_;
 
   // Overrides the default registry key for IE registry keys like favorites,
   // settings, password store, etc.
   ImporterTestRegistryOverrider test_registry_overrider_;
 };
 
 IN_PROC_BROWSER_TEST_F(IEImporterBrowserTest, IEImporter) {
   // Sets up a favorites folder.
-  base::FilePath path = temp_dir_.path().AppendASCII("Favorites");
+  base::FilePath path = temp_dir_.GetPath().AppendASCII("Favorites");
   CreateDirectory(path.value().c_str(), NULL);
   CreateDirectory(path.AppendASCII("SubFolder").value().c_str(), NULL);
   base::FilePath links_path = path.AppendASCII("Links");
   CreateDirectory(links_path.value().c_str(), NULL);
   CreateDirectory(links_path.AppendASCII("SubFolderOfLinks").value().c_str(),
                   NULL);
   CreateDirectory(path.AppendASCII("\x0061").value().c_str(), NULL);
   ASSERT_TRUE(CreateUrlFileWithFavicon(path.AppendASCII("Google Home Page.url"),
                                        L"http://www.google.com/",
                                        L"http://www.google.com/favicon.ico"));
@@ skipping 50 matching lines @@
   // Starts to import the above settings.
   // Deletes itself.
   ExternalProcessImporterHost* host = new ExternalProcessImporterHost;
   TestObserver* observer = new TestObserver(
       importer::HISTORY | importer::PASSWORDS | importer::FAVORITES,
       TestObserver::IE6);
   host->set_observer(observer);
 
   importer::SourceProfile source_profile;
   source_profile.importer_type = importer::TYPE_IE;
-  source_profile.source_path = temp_dir_.path();
+  source_profile.source_path = temp_dir_.GetPath();
 
   host->StartImportSettings(
       source_profile,
       browser()->profile(),
       importer::HISTORY | importer::PASSWORDS | importer::FAVORITES,
       observer);
   base::RunLoop().Run();
 
   // Cleans up.
   url_history_stg2->DeleteUrl(kIEIdentifyUrl, 0);
   url_history_stg2->DeleteUrl(kIECacheItemUrl, 0);
   url_history_stg2.Release();
 }
 
 IN_PROC_BROWSER_TEST_F(IEImporterBrowserTest,
                        IEImporterMalformedFavoritesRegistry) {
   // Sets up a favorites folder.
-  base::FilePath path = temp_dir_.path().AppendASCII("Favorites");
+  base::FilePath path = temp_dir_.GetPath().AppendASCII("Favorites");
   CreateDirectory(path.value().c_str(), NULL);
   CreateDirectory(path.AppendASCII("b").value().c_str(), NULL);
   ASSERT_TRUE(CreateUrlFile(path.AppendASCII("a.url"),
                             L"http://www.google.com/0"));
   ASSERT_TRUE(CreateUrlFile(path.AppendASCII("b").AppendASCII("a.url"),
                             L"http://www.google.com/1"));
   ASSERT_TRUE(CreateUrlFile(path.AppendASCII("b").AppendASCII("b.url"),
                             L"http://www.google.com/2"));
   ASSERT_TRUE(CreateUrlFile(path.AppendASCII("c.url"),
                             L"http://www.google.com/3"));
@@ skipping 39 matching lines @@
 
     // Starts to import the above settings.
     // Deletes itself.
     ExternalProcessImporterHost* host = new ExternalProcessImporterHost;
     MalformedFavoritesRegistryTestObserver* observer =
         new MalformedFavoritesRegistryTestObserver();
     host->set_observer(observer);
 
     importer::SourceProfile source_profile;
     source_profile.importer_type = importer::TYPE_IE;
-    source_profile.source_path = temp_dir_.path();
+    source_profile.source_path = temp_dir_.GetPath();
 
     host->StartImportSettings(
         source_profile,
         browser()->profile(),
         importer::FAVORITES,
         observer);
     base::RunLoop().Run();
   }
 }
 
 IN_PROC_BROWSER_TEST_F(IEImporterBrowserTest, IE7ImporterPasswordsTest) {
   // Starts to import the IE7 passwords.
   // Deletes itself.
   ExternalProcessImporterHost* host = new ExternalProcessImporterHost;
   TestObserver* observer = new TestObserver(importer::PASSWORDS,
                                             TestObserver::IE7);
   host->set_observer(observer);
 
   base::string16 key_path(importer::GetIE7PasswordsKey());
   base::win::RegKey key;
   ASSERT_EQ(ERROR_SUCCESS,
             key.Create(HKEY_CURRENT_USER, key_path.c_str(), KEY_WRITE));
   key.WriteValue(L"Test1", 1);
 
   importer::SourceProfile source_profile;
   source_profile.importer_type = importer::TYPE_IE;
-  source_profile.source_path = temp_dir_.path();
+  source_profile.source_path = temp_dir_.GetPath();
 
   host->StartImportSettings(
       source_profile,
       browser()->profile(),
       importer::PASSWORDS,
       observer);
   base::RunLoop().Run();
 }
 
 IN_PROC_BROWSER_TEST_F(IEImporterBrowserTest, IEImporterHomePageTest) {
   // Starts to import the IE home page.
   // Deletes itself.
   ExternalProcessImporterHost* host = new ExternalProcessImporterHost;
   TestObserver* observer = new TestObserver(importer::HOME_PAGE,
                                             TestObserver::IE6);
   host->set_observer(observer);
 
   base::string16 key_path(importer::GetIESettingsKey());
   base::win::RegKey key;
   ASSERT_EQ(ERROR_SUCCESS,
             key.Create(HKEY_CURRENT_USER, key_path.c_str(), KEY_WRITE));
   key.WriteValue(L"Start Page", L"http://www.test.com/");
 
   importer::SourceProfile source_profile;
   source_profile.importer_type = importer::TYPE_IE;
-  source_profile.source_path = temp_dir_.path();
+  source_profile.source_path = temp_dir_.GetPath();
 
   host->StartImportSettings(
       source_profile,
       browser()->profile(),
       importer::HOME_PAGE,
       observer);
   base::RunLoop().Run();
 }