Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

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

Issue 1551503002: Convert Pass()→std::move() in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
OLDNEW
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 "chrome/browser/search/hotword_service.h"
6
7 #include <utility>
8
5 #include "base/command_line.h" 9 #include "base/command_line.h"
6 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
7 #include "base/metrics/field_trial.h" 11 #include "base/metrics/field_trial.h"
8 #include "base/prefs/pref_service.h" 12 #include "base/prefs/pref_service.h"
9 #include "base/test/test_simple_task_runner.h" 13 #include "base/test/test_simple_task_runner.h"
10 #include "build/build_config.h" 14 #include "build/build_config.h"
11 #include "chrome/browser/browser_process.h" 15 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/extensions/extension_service_test_base.h" 16 #include "chrome/browser/extensions/extension_service_test_base.h"
13 #include "chrome/browser/extensions/test_extension_service.h" 17 #include "chrome/browser/extensions/test_extension_service.h"
14 #include "chrome/browser/search/hotword_audio_history_handler.h" 18 #include "chrome/browser/search/hotword_audio_history_handler.h"
15 #include "chrome/browser/search/hotword_service.h"
16 #include "chrome/browser/search/hotword_service_factory.h" 19 #include "chrome/browser/search/hotword_service_factory.h"
17 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
18 #include "chrome/common/extensions/extension_constants.h" 21 #include "chrome/common/extensions/extension_constants.h"
19 #include "chrome/common/pref_names.h" 22 #include "chrome/common/pref_names.h"
20 #include "chrome/test/base/testing_profile.h" 23 #include "chrome/test/base/testing_profile.h"
21 #include "components/history/core/browser/web_history_service.h" 24 #include "components/history/core/browser/web_history_service.h"
22 #include "content/public/test/test_browser_thread_bundle.h" 25 #include "content/public/test/test_browser_thread_bundle.h"
23 #include "extensions/browser/extension_system.h" 26 #include "extensions/browser/extension_system.h"
24 #include "extensions/common/extension.h" 27 #include "extensions/common/extension.h"
25 #include "extensions/common/extension_builder.h" 28 #include "extensions/common/extension_builder.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 } 80 }
78 81
79 void InstallHotwordExtensionFromWebstore(int num_tries) override { 82 void InstallHotwordExtensionFromWebstore(int num_tries) override {
80 scoped_ptr<base::DictionaryValue> manifest = 83 scoped_ptr<base::DictionaryValue> manifest =
81 extensions::DictionaryBuilder() 84 extensions::DictionaryBuilder()
82 .Set("name", "Hotword Test Extension") 85 .Set("name", "Hotword Test Extension")
83 .Set("version", "1.0") 86 .Set("version", "1.0")
84 .Set("manifest_version", 2) 87 .Set("manifest_version", 2)
85 .Build(); 88 .Build();
86 scoped_refptr<extensions::Extension> extension = 89 scoped_refptr<extensions::Extension> extension =
87 extensions::ExtensionBuilder().SetManifest(manifest.Pass()) 90 extensions::ExtensionBuilder()
88 .AddFlags(extensions::Extension::FROM_WEBSTORE 91 .SetManifest(std::move(manifest))
89 | extensions::Extension::WAS_INSTALLED_BY_DEFAULT) 92 .AddFlags(extensions::Extension::FROM_WEBSTORE |
90 .SetID(extension_id_) 93 extensions::Extension::WAS_INSTALLED_BY_DEFAULT)
91 .SetLocation(extensions::Manifest::EXTERNAL_COMPONENT) 94 .SetID(extension_id_)
92 .Build(); 95 .SetLocation(extensions::Manifest::EXTERNAL_COMPONENT)
96 .Build();
93 ASSERT_TRUE(extension.get()); 97 ASSERT_TRUE(extension.get());
94 service_->OnExtensionInstalled(extension.get(), syncer::StringOrdinal()); 98 service_->OnExtensionInstalled(extension.get(), syncer::StringOrdinal());
95 } 99 }
96 100
97 101
98 int uninstall_count() { return uninstall_count_; } 102 int uninstall_count() { return uninstall_count_; }
99 103
100 void SetExtensionService(ExtensionService* service) { service_ = service; } 104 void SetExtensionService(ExtensionService* service) { service_ = service; }
101 void SetExtensionId(const std::string& extension_id) { 105 void SetExtensionId(const std::string& extension_id) {
102 extension_id_ = extension_id; 106 extension_id_ = extension_id;
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 EXPECT_EQ(1, audio_history_handler->GetAudioHistoryCalls()); 524 EXPECT_EQ(1, audio_history_handler->GetAudioHistoryCalls());
521 // We expect the next check for audio history to be in the queue. 525 // We expect the next check for audio history to be in the queue.
522 EXPECT_EQ(base::TimeDelta::FromDays(1), 526 EXPECT_EQ(base::TimeDelta::FromDays(1),
523 test_task_runner->NextPendingTaskDelay()); 527 test_task_runner->NextPendingTaskDelay());
524 EXPECT_TRUE(test_task_runner->HasPendingTask()); 528 EXPECT_TRUE(test_task_runner->HasPendingTask());
525 test_task_runner->RunPendingTasks(); 529 test_task_runner->RunPendingTasks();
526 EXPECT_EQ(2, audio_history_handler->GetAudioHistoryCalls()); 530 EXPECT_EQ(2, audio_history_handler->GetAudioHistoryCalls());
527 EXPECT_TRUE(test_task_runner->HasPendingTask()); 531 EXPECT_TRUE(test_task_runner->HasPendingTask());
528 test_task_runner->ClearPendingTasks(); 532 test_task_runner->ClearPendingTasks();
529 } 533 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698