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

Side by Side Diff: chrome/test/base/testing_profile.cc

Issue 15984016: Call scoped_refptr<T>::get() rather than relying on implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/test/base/testing_profile.h" 5 #include "chrome/test/base/testing_profile.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 } 687 }
688 688
689 content::GeolocationPermissionContext* 689 content::GeolocationPermissionContext*
690 TestingProfile::GetGeolocationPermissionContext() { 690 TestingProfile::GetGeolocationPermissionContext() {
691 return ChromeGeolocationPermissionContextFactory::GetForProfile(this); 691 return ChromeGeolocationPermissionContextFactory::GetForProfile(this);
692 } 692 }
693 693
694 content::SpeechRecognitionPreferences* 694 content::SpeechRecognitionPreferences*
695 TestingProfile::GetSpeechRecognitionPreferences() { 695 TestingProfile::GetSpeechRecognitionPreferences() {
696 #if defined(ENABLE_INPUT_SPEECH) 696 #if defined(ENABLE_INPUT_SPEECH)
697 return ChromeSpeechRecognitionPreferences::GetForProfile(this); 697 return ChromeSpeechRecognitionPreferences::GetForProfile(this).get();
698 #else 698 #else
699 return NULL; 699 return NULL;
700 #endif 700 #endif
701 } 701 }
702 702
703 std::wstring TestingProfile::GetName() { 703 std::wstring TestingProfile::GetName() {
704 return std::wstring(); 704 return std::wstring();
705 } 705 }
706 706
707 std::wstring TestingProfile::GetID() { 707 std::wstring TestingProfile::GetID() {
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 807
808 scoped_ptr<TestingProfile> TestingProfile::Builder::Build() { 808 scoped_ptr<TestingProfile> TestingProfile::Builder::Build() {
809 DCHECK(!build_called_); 809 DCHECK(!build_called_);
810 build_called_ = true; 810 build_called_ = true;
811 return scoped_ptr<TestingProfile>(new TestingProfile( 811 return scoped_ptr<TestingProfile>(new TestingProfile(
812 path_, 812 path_,
813 delegate_, 813 delegate_,
814 extension_policy_, 814 extension_policy_,
815 pref_service_.Pass())); 815 pref_service_.Pass()));
816 } 816 }
OLDNEW
« no previous file with comments | « chrome/test/base/testing_pref_service_syncable.cc ('k') | chrome/test/chromedriver/chrome/adb_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698