Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / download / chrome_download_manager_delegate_unittest.cc

diff --git a/src/chrome/browser/download/chrome_download_manager_delegate_unittest.cc b/src/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
index 01422f1..bb67541 100644 (file)
--- a/src/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
+++ b/src/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
@@ -218,7 +218,7 @@ content::MockDownloadItem*
   ON_CALL(*item, GetTargetFilePath())
       .WillByDefault(ReturnRefOfCopy(base::FilePath()));
   ON_CALL(*item, GetTransitionType())
-      .WillByDefault(Return(content::PAGE_TRANSITION_LINK));
+      .WillByDefault(Return(ui::PAGE_TRANSITION_LINK));
   ON_CALL(*item, GetWebContents())
       .WillByDefault(Return(web_contents()));
   ON_CALL(*item, HasUserGesture())
@@ -386,7 +386,7 @@ TEST_F(ChromeDownloadManagerDelegateTest, CheckForFileExistence) {
   base::FilePath existing_path = default_download_path().AppendASCII("foo");
   base::FilePath non_existent_path =
       default_download_path().AppendASCII("bar");
-  file_util::WriteFile(existing_path, kData, kDataLength);
+  base::WriteFile(existing_path, kData, kDataLength);
 
   scoped_ptr<content::MockDownloadItem> download_item(
       CreateActiveDownloadItem(1));