From 868fa2fe829687343ffae624259930155e16dbd8 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Tue, 11 Jun 2013 10:57:03 +0100 Subject: Merge from Chromium at DEPS revision r205460 This commit was generated by merge_to_master.py. Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540 --- content/browser/download/base_file_unittest.cc | 42 +------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) (limited to 'content/browser/download/base_file_unittest.cc') diff --git a/content/browser/download/base_file_unittest.cc b/content/browser/download/base_file_unittest.cc index 7b53c4dbd2..dab5cc2dd6 100644 --- a/content/browser/download/base_file_unittest.cc +++ b/content/browser/download/base_file_unittest.cc @@ -8,7 +8,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/test/test_file_util.h" #include "content/browser/browser_thread_impl.h" #include "content/public/browser/download_interrupt_reasons.h" @@ -612,46 +612,6 @@ TEST_F(BaseFileTest, IsEmptyHash) { EXPECT_FALSE(BaseFile::IsEmptyHash(std::string())); } -// Test that calculating speed after no writes. -TEST_F(BaseFileTest, SpeedWithoutWrite) { - ASSERT_TRUE(InitializeFile()); - base::TimeTicks current = StartTick() + kElapsedTimeDelta; - ASSERT_EQ(0, CurrentSpeedAtTime(current)); - base_file_->Finish(); -} - -// Test that calculating speed after a single write. -TEST_F(BaseFileTest, SpeedAfterSingleWrite) { - ASSERT_TRUE(InitializeFile()); - ASSERT_TRUE(AppendDataToFile(kTestData1)); - base::TimeTicks current = StartTick() + kElapsedTimeDelta; - int64 expected_speed = kTestDataLength1 / kElapsedTimeSeconds; - ASSERT_EQ(expected_speed, CurrentSpeedAtTime(current)); - base_file_->Finish(); -} - -// Test that calculating speed after a multiple writes. -TEST_F(BaseFileTest, SpeedAfterMultipleWrite) { - ASSERT_TRUE(InitializeFile()); - ASSERT_TRUE(AppendDataToFile(kTestData1)); - ASSERT_TRUE(AppendDataToFile(kTestData2)); - ASSERT_TRUE(AppendDataToFile(kTestData3)); - ASSERT_TRUE(AppendDataToFile(kTestData4)); - base::TimeTicks current = StartTick() + kElapsedTimeDelta; - int64 expected_speed = (kTestDataLength1 + kTestDataLength2 + - kTestDataLength3 + kTestDataLength4) / kElapsedTimeSeconds; - ASSERT_EQ(expected_speed, CurrentSpeedAtTime(current)); - base_file_->Finish(); -} - -// Test that calculating speed after no delay - should not divide by 0. -TEST_F(BaseFileTest, SpeedAfterNoElapsedTime) { - ASSERT_TRUE(InitializeFile()); - ASSERT_TRUE(AppendDataToFile(kTestData1)); - ASSERT_EQ(0, CurrentSpeedAtTime(StartTick())); - base_file_->Finish(); -} - // Test that a temporary file is created in the default download directory. TEST_F(BaseFileTest, CreatedInDefaultDirectory) { ASSERT_TRUE(base_file_->full_path().empty()); -- cgit v1.2.3