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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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/macros.h" 6 #include "base/macros.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/prefs/pref_service.h"
9 #include "chrome/browser/extensions/api/hotword_private/hotword_private_api.h" 8 #include "chrome/browser/extensions/api/hotword_private/hotword_private_api.h"
10 #include "chrome/browser/extensions/extension_apitest.h" 9 #include "chrome/browser/extensions/extension_apitest.h"
11 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
12 #include "chrome/browser/history/web_history_service_factory.h" 11 #include "chrome/browser/history/web_history_service_factory.h"
13 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/search/hotword_audio_history_handler.h" 13 #include "chrome/browser/search/hotword_audio_history_handler.h"
15 #include "chrome/browser/search/hotword_client.h" 14 #include "chrome/browser/search/hotword_client.h"
16 #include "chrome/browser/search/hotword_service.h" 15 #include "chrome/browser/search/hotword_service.h"
17 #include "chrome/browser/search/hotword_service_factory.h" 16 #include "chrome/browser/search/hotword_service_factory.h"
18 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 17 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
19 #include "chrome/browser/signin/signin_manager_factory.h" 18 #include "chrome/browser/signin/signin_manager_factory.h"
20 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
21 #include "chrome/common/pref_names.h" 20 #include "chrome/common/pref_names.h"
22 #include "components/history/core/browser/web_history_service.h" 21 #include "components/history/core/browser/web_history_service.h"
22 #include "components/prefs/pref_service.h"
23 #include "components/signin/core/browser/profile_oauth2_token_service.h" 23 #include "components/signin/core/browser/profile_oauth2_token_service.h"
24 #include "components/signin/core/browser/signin_manager.h" 24 #include "components/signin/core/browser/signin_manager.h"
25 #include "extensions/common/switches.h" 25 #include "extensions/common/switches.h"
26 #include "extensions/test/extension_test_message_listener.h" 26 #include "extensions/test/extension_test_message_listener.h"
27 #include "net/url_request/url_request_context_getter.h" 27 #include "net/url_request/url_request_context_getter.h"
28 28
29 namespace { 29 namespace {
30 30
31 const char kHotwordTestExtensionId[] = "cpfhkdbjfdgdebcjlifoldbijinjfifp"; 31 const char kHotwordTestExtensionId[] = "cpfhkdbjfdgdebcjlifoldbijinjfifp";
32 32
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 ExtensionTestMessageListener setListenerT("set AH: false failure", false); 528 ExtensionTestMessageListener setListenerT("set AH: false failure", false);
529 ExtensionTestMessageListener setListenerF("set AH: false failure", false); 529 ExtensionTestMessageListener setListenerF("set AH: false failure", false);
530 ExtensionTestMessageListener getListener("get AH: false failure", false); 530 ExtensionTestMessageListener getListener("get AH: false failure", false);
531 531
532 ASSERT_TRUE(RunComponentExtensionTest("audioHistory")) << message_; 532 ASSERT_TRUE(RunComponentExtensionTest("audioHistory")) << message_;
533 533
534 EXPECT_TRUE(setListenerT.WaitUntilSatisfied()); 534 EXPECT_TRUE(setListenerT.WaitUntilSatisfied());
535 EXPECT_TRUE(setListenerF.WaitUntilSatisfied()); 535 EXPECT_TRUE(setListenerF.WaitUntilSatisfied());
536 EXPECT_TRUE(getListener.WaitUntilSatisfied()); 536 EXPECT_TRUE(getListener.WaitUntilSatisfied());
537 } 537 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/hotword_private/hotword_private_api.cc ('k') | chrome/browser/extensions/api/i18n/i18n_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698