//chrome/browser and //components A-E: Change ScopedTempDir::path() to GetPath()

chrome/browser/download/notification/download_notification_browsertest.cc

 // Copyright 2015 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 <stddef.h>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 267 matching lines @@
 
   void SetUpOnMainThread() override {
     ASSERT_TRUE(embedded_test_server()->Start());
 
     content::BrowserThread::PostTask(
         content::BrowserThread::IO, FROM_HERE,
         base::Bind(&net::URLRequestSlowDownloadJob::AddUrlHandler));
 
     GetMessageCenter()->DisableTimersForTest();
 
-    // Set up the temporary download folder.
-    ASSERT_TRUE(CreateAndSetDownloadsDirectory(browser()));
+    ASSERT_TRUE(downloads_directory_.CreateUniqueTempDir());
+    ASSERT_TRUE(SetDownloadsDirectory(browser()));
   }
 
  protected:
-  // Must be called after browser creation.  Creates a temporary
-  // directory for downloads that is auto-deleted on destruction.
-  // Returning false indicates a failure of the function, and should be asserted
-  // in the caller.
-  bool CreateAndSetDownloadsDirectory(Browser* browser) {
+  // Must be called after browser creation. Assumes that |downloads_directory_|

[vabr (Chromium), 2016/09/12 08:23:12]

To get rid of the need to check whether the directory was already created, I
separated the actions of creating the ScopedTempDir and of registering the paths
with the browser.

+  // is created and sets its path to be used for downloads by |browser|.
+  // Returning false indicates a failure of the function, and should be
+  // asserted in the caller.
+  bool SetDownloadsDirectory(Browser* browser) {
     if (!browser)
       return false;
 
-    if (!downloads_directory_.path().empty())
-      return true;  // already created
-
-    if (!downloads_directory_.CreateUniqueTempDir())
-      return false;
-
     browser->profile()->GetPrefs()->SetFilePath(
-        prefs::kDownloadDefaultDirectory,
-        downloads_directory_.path());
+        prefs::kDownloadDefaultDirectory, downloads_directory_.GetPath());
     browser->profile()->GetPrefs()->SetFilePath(
-        prefs::kSaveFileDefaultDirectory,
-        downloads_directory_.path());
+        prefs::kSaveFileDefaultDirectory, downloads_directory_.GetPath());
 
     return true;
   }
 
   content::DownloadManager* GetDownloadManager(Browser* browser) {
     return content::BrowserContext::GetDownloadManager(browser->profile());
   }
 
  private:
   // Location of the downloads directory for these tests
@@ skipping 24 matching lines @@
   TestChromeDownloadManagerDelegate* GetDownloadManagerDelegate() const {
     return static_cast<TestChromeDownloadManagerDelegate*>(
         DownloadServiceFactory::GetForBrowserContext(browser()->profile())
             ->GetDownloadManagerDelegate());
   }
 
   void PrepareIncognitoBrowser() {
     incognito_browser_ = CreateIncognitoBrowser();
     Profile* incognito_profile = incognito_browser_->profile();
 
-    ASSERT_TRUE(CreateAndSetDownloadsDirectory(incognito_browser_));
+    ASSERT_TRUE(SetDownloadsDirectory(incognito_browser_));
 
     std::unique_ptr<TestChromeDownloadManagerDelegate> incognito_test_delegate;
     incognito_test_delegate.reset(
         new TestChromeDownloadManagerDelegate(incognito_profile));
     DownloadServiceFactory::GetForBrowserContext(incognito_profile)
         ->SetDownloadManagerDelegateForTesting(
             std::move(incognito_test_delegate));
   }
 
   TestChromeDownloadManagerDelegate* GetIncognitoDownloadManagerDelegate()
@@ skipping 940 matching lines @@
   EXPECT_EQ(message_center::NOTIFICATION_TYPE_BASE_FORMAT,
             GetNotification(notification_id_user1)->type());
   EXPECT_EQ(message_center::NOTIFICATION_TYPE_BASE_FORMAT,
             GetNotification(notification_id_user2_1)->type());
   // Normal notifications for user2.
   EXPECT_EQ(message_center::NOTIFICATION_TYPE_BASE_FORMAT,
             GetNotification(notification_id_user2_1)->type());
   EXPECT_EQ(message_center::NOTIFICATION_TYPE_BASE_FORMAT,
             GetNotification(notification_id_user2_2)->type());
 }