Update To 11.40.268.0

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

diff --git a/src/chrome/browser/download/download_ui_controller_unittest.cc b/src/chrome/browser/download/download_ui_controller_unittest.cc
index d16ed5f..59aa68b 100644 (file)
--- a/src/chrome/browser/download/download_ui_controller_unittest.cc
+++ b/src/chrome/browser/download/download_ui_controller_unittest.cc
@@ -37,10 +37,10 @@ namespace {
 class TestDelegate : public DownloadUIController::Delegate {
  public:
   explicit TestDelegate(base::WeakPtr<content::DownloadItem*> receiver);
-  virtual ~TestDelegate() {}
+  ~TestDelegate() override {}
 
  private:
-  virtual void OnNewDownloadReady(content::DownloadItem* item) OVERRIDE;
+  void OnNewDownloadReady(content::DownloadItem* item) override;
 
   base::WeakPtr<content::DownloadItem*> receiver_;
 };
@@ -58,12 +58,12 @@ void TestDelegate::OnNewDownloadReady(content::DownloadItem* item) {
 class TestDownloadService : public DownloadService {
  public:
   explicit TestDownloadService(Profile* profile);
-  virtual ~TestDownloadService();
+  ~TestDownloadService() override;
 
   void set_download_history(scoped_ptr<DownloadHistory> download_history) {
     download_history_.swap(download_history);
   }
-  virtual DownloadHistory* GetDownloadHistory() OVERRIDE;
+  DownloadHistory* GetDownloadHistory() override;
 
  private:
   scoped_ptr<DownloadHistory> download_history_;
@@ -87,7 +87,7 @@ class DownloadUIControllerTest : public ChromeRenderViewHostTestHarness {
 
  protected:
   // testing::Test
-  virtual void SetUp() OVERRIDE;
+  void SetUp() override;
 
   // Returns a TestDelegate. Invoking OnNewDownloadReady on the returned
   // delegate results in the DownloadItem* being stored in |notified_item_|.
@@ -127,8 +127,8 @@ class DownloadUIControllerTest : public ChromeRenderViewHostTestHarness {
     HistoryService::DownloadQueryCallback download_query_callback_;
 
    private:
-    virtual void QueryDownloads(
-        const HistoryService::DownloadQueryCallback& callback) OVERRIDE {
+    void QueryDownloads(
+        const HistoryService::DownloadQueryCallback& callback) override {
       download_query_callback_ = callback;
     }
   };
@@ -175,9 +175,8 @@ void DownloadUIControllerTest::SetUp() {
 
   scoped_ptr<HistoryAdapter> history_adapter(new HistoryAdapter);
   history_adapter_ = history_adapter.get();
-  scoped_ptr<DownloadHistory> download_history(new DownloadHistory(
-      manager_.get(),
-      history_adapter.PassAs<DownloadHistory::HistoryAdapter>()));
+  scoped_ptr<DownloadHistory> download_history(
+      new DownloadHistory(manager_.get(), history_adapter.Pass()));
   ASSERT_TRUE(download_history_manager_observer_);
 
   EXPECT_CALL(*manager_, AddObserver(_))