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

Side by Side Diff: chrome/browser/search_engines/template_url_model_unittest.cc

Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/callback.h" 5 #include "base/callback.h"
6 #include "base/scoped_vector.h" 6 #include "base/scoped_vector.h"
7 #include "base/string_split.h" 7 #include "base/string_split.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/ref_counted.h" 9 #include "base/ref_counted.h"
10 #include "base/thread.h" 10 #include "base/threading/thread.h"
11 #include "chrome/browser/browser_thread.h" 11 #include "chrome/browser/browser_thread.h"
12 #include "chrome/browser/history/history.h" 12 #include "chrome/browser/history/history.h"
13 #include "chrome/browser/history/history_notifications.h" 13 #include "chrome/browser/history/history_notifications.h"
14 #include "chrome/browser/search_engines/search_host_to_urls_map.h" 14 #include "chrome/browser/search_engines/search_host_to_urls_map.h"
15 #include "chrome/browser/search_engines/search_terms_data.h" 15 #include "chrome/browser/search_engines/search_terms_data.h"
16 #include "chrome/browser/search_engines/template_url.h" 16 #include "chrome/browser/search_engines/template_url.h"
17 #include "chrome/browser/search_engines/template_url_model.h" 17 #include "chrome/browser/search_engines/template_url_model.h"
18 #include "chrome/browser/search_engines/template_url_model_test_util.h" 18 #include "chrome/browser/search_engines/template_url_model_test_util.h"
19 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 19 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
20 #include "chrome/browser/webdata/web_database.h" 20 #include "chrome/browser/webdata/web_database.h"
(...skipping 1152 matching lines...) Expand 10 before | Expand all | Expand 10 after
1173 kEncodings, ""); 1173 kEncodings, "");
1174 VerifyObserverFired(); 1174 VerifyObserverFired();
1175 EXPECT_TRUE(model()->is_default_search_managed()); 1175 EXPECT_TRUE(model()->is_default_search_managed());
1176 EXPECT_EQ(2 + initial_count, model()->GetTemplateURLs().size()); 1176 EXPECT_EQ(2 + initial_count, model()->GetTemplateURLs().size());
1177 1177
1178 // Verify that the default manager we are getting is the managed one. 1178 // Verify that the default manager we are getting is the managed one.
1179 actual_managed_default = model()->GetDefaultSearchProvider(); 1179 actual_managed_default = model()->GetDefaultSearchProvider();
1180 ExpectSimilar(actual_managed_default, expected_managed_default1.get()); 1180 ExpectSimilar(actual_managed_default, expected_managed_default1.get());
1181 EXPECT_EQ(actual_managed_default->show_in_default_list(), true); 1181 EXPECT_EQ(actual_managed_default->show_in_default_list(), true);
1182 } 1182 }
OLDNEW
« no previous file with comments | « chrome/browser/search_engines/template_url_model_test_util.cc ('k') | chrome/browser/service/service_process_control.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698