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

Side by Side Diff: components/search_engines/template_url_service.h

Issue 1548203002: Convert Pass()→std::move() in //components/[n-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad headers 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 #ifndef COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_ 5 #ifndef COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
6 #define COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_ 6 #define COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9
10 #include <list> 9 #include <list>
11 #include <map> 10 #include <map>
12 #include <set> 11 #include <set>
13 #include <string> 12 #include <string>
13 #include <utility>
14 #include <vector> 14 #include <vector>
15 15
16 #include "base/callback_list.h" 16 #include "base/callback_list.h"
17 #include "base/gtest_prod_util.h" 17 #include "base/gtest_prod_util.h"
18 #include "base/macros.h" 18 #include "base/macros.h"
19 #include "base/memory/scoped_ptr.h" 19 #include "base/memory/scoped_ptr.h"
20 #include "base/observer_list.h" 20 #include "base/observer_list.h"
21 #include "base/prefs/pref_change_registrar.h" 21 #include "base/prefs/pref_change_registrar.h"
22 #include "base/time/clock.h" 22 #include "base/time/clock.h"
23 #include "components/google/core/browser/google_url_tracker.h" 23 #include "components/google/core/browser/google_url_tracker.h"
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 const SearchTermsData& search_terms_data, 377 const SearchTermsData& search_terms_data,
378 TemplateURL* existing_turl, 378 TemplateURL* existing_turl,
379 const syncer::SyncData& sync_data, 379 const syncer::SyncData& sync_data,
380 syncer::SyncChangeList* change_list); 380 syncer::SyncChangeList* change_list);
381 381
382 // Returns a map mapping Sync GUIDs to pointers to syncer::SyncData. 382 // Returns a map mapping Sync GUIDs to pointers to syncer::SyncData.
383 static SyncDataMap CreateGUIDToSyncDataMap( 383 static SyncDataMap CreateGUIDToSyncDataMap(
384 const syncer::SyncDataList& sync_data); 384 const syncer::SyncDataList& sync_data);
385 385
386 #if defined(UNIT_TEST) 386 #if defined(UNIT_TEST)
387 void set_clock(scoped_ptr<base::Clock> clock) { clock_ = clock.Pass(); } 387 void set_clock(scoped_ptr<base::Clock> clock) { clock_ = std::move(clock); }
388 #endif 388 #endif
389 389
390 private: 390 private:
391 FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest, TestManagedDefaultSearch); 391 FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest, TestManagedDefaultSearch);
392 FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest, 392 FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest,
393 UpdateKeywordSearchTermsForURL); 393 UpdateKeywordSearchTermsForURL);
394 FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest, 394 FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest,
395 DontUpdateKeywordSearchForNonReplaceable); 395 DontUpdateKeywordSearchForNonReplaceable);
396 FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest, ChangeGoogleBaseValue); 396 FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest, ChangeGoogleBaseValue);
397 FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest, MergeDeletesUnusedProviders); 397 FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest, MergeDeletesUnusedProviders);
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
813 813
814 // Helper class to manage the default search engine. 814 // Helper class to manage the default search engine.
815 DefaultSearchManager default_search_manager_; 815 DefaultSearchManager default_search_manager_;
816 816
817 scoped_ptr<GoogleURLTracker::Subscription> google_url_updated_subscription_; 817 scoped_ptr<GoogleURLTracker::Subscription> google_url_updated_subscription_;
818 818
819 DISALLOW_COPY_AND_ASSIGN(TemplateURLService); 819 DISALLOW_COPY_AND_ASSIGN(TemplateURLService);
820 }; 820 };
821 821
822 #endif // COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_ 822 #endif // COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
OLDNEW
« no previous file with comments | « components/search_engines/template_url_prepopulate_data.cc ('k') | components/search_engines/template_url_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698