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

Side by Side Diff: chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc

Issue 1165913002: [Cleanup] Used scoped pointers in KeyedServiceFactory's SetTestingFactory functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 6 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/memory/scoped_ptr.h"
6 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
7 #include "chrome/browser/extensions/api/hotword_private/hotword_private_api.h" 8 #include "chrome/browser/extensions/api/hotword_private/hotword_private_api.h"
8 #include "chrome/browser/extensions/extension_apitest.h" 9 #include "chrome/browser/extensions/extension_apitest.h"
9 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/history/web_history_service_factory.h" 11 #include "chrome/browser/history/web_history_service_factory.h"
11 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/search/hotword_audio_history_handler.h" 13 #include "chrome/browser/search/hotword_audio_history_handler.h"
13 #include "chrome/browser/search/hotword_client.h" 14 #include "chrome/browser/search/hotword_client.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"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 explicit MockHotwordService(Profile* profile) 92 explicit MockHotwordService(Profile* profile)
92 : HotwordService(profile), service_available_(true) {} 93 : HotwordService(profile), service_available_(true) {}
93 ~MockHotwordService() override {} 94 ~MockHotwordService() override {}
94 95
95 bool IsServiceAvailable() override { return service_available_; } 96 bool IsServiceAvailable() override { return service_available_; }
96 97
97 void setServiceAvailable(bool available) { 98 void setServiceAvailable(bool available) {
98 service_available_ = available; 99 service_available_ = available;
99 } 100 }
100 101
101 static KeyedService* Build(content::BrowserContext* profile) { 102 static scoped_ptr<KeyedService> Build(content::BrowserContext* profile) {
102 return new MockHotwordService(static_cast<Profile*>(profile)); 103 return make_scoped_ptr(
104 new MockHotwordService(static_cast<Profile*>(profile)));
103 } 105 }
104 106
105 LaunchMode GetHotwordAudioVerificationLaunchMode() override { 107 LaunchMode GetHotwordAudioVerificationLaunchMode() override {
106 return launch_mode_; 108 return launch_mode_;
107 } 109 }
108 110
109 void SetHotwordAudioVerificationLaunchMode(const LaunchMode& launch_mode) { 111 void SetHotwordAudioVerificationLaunchMode(const LaunchMode& launch_mode) {
110 launch_mode_ = launch_mode; 112 launch_mode_ = launch_mode;
111 } 113 }
112 114
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 ExtensionTestMessageListener setListenerT("set AH: false failure", false); 527 ExtensionTestMessageListener setListenerT("set AH: false failure", false);
526 ExtensionTestMessageListener setListenerF("set AH: false failure", false); 528 ExtensionTestMessageListener setListenerF("set AH: false failure", false);
527 ExtensionTestMessageListener getListener("get AH: false failure", false); 529 ExtensionTestMessageListener getListener("get AH: false failure", false);
528 530
529 ASSERT_TRUE(RunComponentExtensionTest("audioHistory")) << message_; 531 ASSERT_TRUE(RunComponentExtensionTest("audioHistory")) << message_;
530 532
531 EXPECT_TRUE(setListenerT.WaitUntilSatisfied()); 533 EXPECT_TRUE(setListenerT.WaitUntilSatisfied());
532 EXPECT_TRUE(setListenerF.WaitUntilSatisfied()); 534 EXPECT_TRUE(setListenerF.WaitUntilSatisfied());
533 EXPECT_TRUE(getListener.WaitUntilSatisfied()); 535 EXPECT_TRUE(getListener.WaitUntilSatisfied());
534 } 536 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698