chrome/browser/search/hotword_service_unittest.cc - Issue 889553003: Revert of Componentize WebHistoryService

Side by Side Diff: chrome/browser/search/hotword_service_unittest.cc

Issue 889553003: Revert of Componentize WebHistoryService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Mon Feb 2 15:10:48 PST 2015 Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « chrome/browser/search/hotword_audio_history_handler.cc ('k') | chrome/browser/ui/webui/history_ui.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/command_line.h"	5 #include "base/command_line.h"

6 #include "base/memory/scoped_ptr.h"	6 #include "base/memory/scoped_ptr.h"

7 #include "base/metrics/field_trial.h"	7 #include "base/metrics/field_trial.h"

8 #include "base/prefs/pref_service.h"	8 #include "base/prefs/pref_service.h"

9 #include "base/test/test_simple_task_runner.h"	9 #include "base/test/test_simple_task_runner.h"

10 #include "chrome/browser/browser_process.h"	10 #include "chrome/browser/browser_process.h"

11 #include "chrome/browser/extensions/extension_service_test_base.h"	11 #include "chrome/browser/extensions/extension_service_test_base.h"

12 #include "chrome/browser/extensions/test_extension_service.h"	12 #include "chrome/browser/extensions/test_extension_service.h"

	13 #include "chrome/browser/history/web_history_service.h"

13 #include "chrome/browser/search/hotword_audio_history_handler.h"	14 #include "chrome/browser/search/hotword_audio_history_handler.h"

14 #include "chrome/browser/search/hotword_service.h"	15 #include "chrome/browser/search/hotword_service.h"

15 #include "chrome/browser/search/hotword_service_factory.h"	16 #include "chrome/browser/search/hotword_service_factory.h"

16 #include "chrome/common/chrome_switches.h"	17 #include "chrome/common/chrome_switches.h"

17 #include "chrome/common/extensions/extension_constants.h"	18 #include "chrome/common/extensions/extension_constants.h"

18 #include "chrome/common/pref_names.h"	19 #include "chrome/common/pref_names.h"

19 #include "chrome/test/base/testing_profile.h"	20 #include "chrome/test/base/testing_profile.h"

20 #include "components/history/core/browser/web_history_service.h"

21 #include "content/public/test/test_browser_thread_bundle.h"	21 #include "content/public/test/test_browser_thread_bundle.h"

22 #include "extensions/browser/extension_system.h"	22 #include "extensions/browser/extension_system.h"

23 #include "extensions/common/extension.h"	23 #include "extensions/common/extension.h"

24 #include "extensions/common/extension_builder.h"	24 #include "extensions/common/extension_builder.h"

25 #include "extensions/common/manifest.h"	25 #include "extensions/common/manifest.h"

26 #include "extensions/common/one_shot_event.h"	26 #include "extensions/common/one_shot_event.h"

27 #include "testing/gtest/include/gtest/gtest.h"	27 #include "testing/gtest/include/gtest/gtest.h"

28	28

29 #if defined(OS_CHROMEOS)	29 #if defined(OS_CHROMEOS)

30 #include "chromeos/audio/cras_audio_handler.h"	30 #include "chromeos/audio/cras_audio_handler.h"

(...skipping 532 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
563 EXPECT_EQ(1, audio_history_handler->GetAudioHistoryCalls());	563 EXPECT_EQ(1, audio_history_handler->GetAudioHistoryCalls());

564 // We expect the next check for audio history to be in the queue.	564 // We expect the next check for audio history to be in the queue.

565 EXPECT_EQ(base::TimeDelta::FromDays(1),	565 EXPECT_EQ(base::TimeDelta::FromDays(1),

566 test_task_runner->NextPendingTaskDelay());	566 test_task_runner->NextPendingTaskDelay());

567 EXPECT_TRUE(test_task_runner->HasPendingTask());	567 EXPECT_TRUE(test_task_runner->HasPendingTask());

568 test_task_runner->RunPendingTasks();	568 test_task_runner->RunPendingTasks();

569 EXPECT_EQ(2, audio_history_handler->GetAudioHistoryCalls());	569 EXPECT_EQ(2, audio_history_handler->GetAudioHistoryCalls());

570 EXPECT_TRUE(test_task_runner->HasPendingTask());	570 EXPECT_TRUE(test_task_runner->HasPendingTask());

571 test_task_runner->ClearPendingTasks();	571 test_task_runner->ClearPendingTasks();

572 }	572 }

OLD	NEW