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

Side by Side Diff: chrome/browser/autocomplete/shortcuts_backend_unittest.cc

Issue 231863008: Rename SetDefaultSearchProvider. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 8 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/browser/autocomplete/shortcuts_backend.h" 5 #include "chrome/browser/autocomplete/shortcuts_backend.h"
6 6
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 void ShortcutsBackendTest::SetSearchProvider() { 99 void ShortcutsBackendTest::SetSearchProvider() {
100 TemplateURLService* template_url_service = 100 TemplateURLService* template_url_service =
101 TemplateURLServiceFactory::GetForProfile(&profile_); 101 TemplateURLServiceFactory::GetForProfile(&profile_);
102 TemplateURLData data; 102 TemplateURLData data;
103 data.SetURL("http://foo.com/search?bar={searchTerms}"); 103 data.SetURL("http://foo.com/search?bar={searchTerms}");
104 data.SetKeyword(base::UTF8ToUTF16("foo")); 104 data.SetKeyword(base::UTF8ToUTF16("foo"));
105 105
106 TemplateURL* template_url = new TemplateURL(&profile_, data); 106 TemplateURL* template_url = new TemplateURL(&profile_, data);
107 // Takes ownership of |template_url|. 107 // Takes ownership of |template_url|.
108 template_url_service->Add(template_url); 108 template_url_service->Add(template_url);
109 template_url_service->SetDefaultSearchProvider(template_url); 109 template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
110 } 110 }
111 111
112 void ShortcutsBackendTest::SetUp() { 112 void ShortcutsBackendTest::SetUp() {
113 db_thread_.Start(); 113 db_thread_.Start();
114 ShortcutsBackendFactory::GetInstance()->SetTestingFactoryAndUse( 114 ShortcutsBackendFactory::GetInstance()->SetTestingFactoryAndUse(
115 &profile_, &ShortcutsBackendFactory::BuildProfileForTesting); 115 &profile_, &ShortcutsBackendFactory::BuildProfileForTesting);
116 backend_ = ShortcutsBackendFactory::GetForProfile(&profile_); 116 backend_ = ShortcutsBackendFactory::GetForProfile(&profile_);
117 ASSERT_TRUE(backend_.get()); 117 ASSERT_TRUE(backend_.get());
118 backend_->AddObserver(this); 118 backend_->AddObserver(this);
119 119
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 ASSERT_TRUE(shortcut4_iter != shortcuts_map().end()); 311 ASSERT_TRUE(shortcut4_iter != shortcuts_map().end());
312 EXPECT_EQ(shortcut4.id, shortcut4_iter->second.id); 312 EXPECT_EQ(shortcut4.id, shortcut4_iter->second.id);
313 313
314 history::ShortcutsDatabase::ShortcutIDs deleted_ids; 314 history::ShortcutsDatabase::ShortcutIDs deleted_ids;
315 deleted_ids.push_back(shortcut3.id); 315 deleted_ids.push_back(shortcut3.id);
316 deleted_ids.push_back(shortcut4.id); 316 deleted_ids.push_back(shortcut4.id);
317 EXPECT_TRUE(DeleteShortcutsWithIDs(deleted_ids)); 317 EXPECT_TRUE(DeleteShortcutsWithIDs(deleted_ids));
318 318
319 ASSERT_EQ(0U, shortcuts_map().size()); 319 ASSERT_EQ(0U, shortcuts_map().size());
320 } 320 }
OLDNEW
« no previous file with comments | « chrome/browser/autocomplete/search_provider_unittest.cc ('k') | chrome/browser/chrome_content_browser_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698