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

Side by Side Diff: chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc

Issue 14307023: chrome: Use base::MessageLoop. (Part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 7 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 "base/message_loop.h" 5 #include "base/message_loop.h"
6 #include "base/string16.h" 6 #include "base/string16.h"
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/search_engines/template_url.h" 9 #include "chrome/browser/search_engines/template_url.h"
10 #include "chrome/browser/search_engines/template_url_service.h" 10 #include "chrome/browser/search_engines/template_url_service.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 model_->Observe(chrome::NOTIFICATION_DEFAULT_SEARCH_POLICY_CHANGED, 83 model_->Observe(chrome::NOTIFICATION_DEFAULT_SEARCH_POLICY_CHANGED,
84 content::NotificationService::AllSources(), 84 content::NotificationService::AllSources(),
85 content::NotificationService::NoDetails()); 85 content::NotificationService::NoDetails());
86 } 86 }
87 87
88 TemplateURLTableModel* table_model() const { 88 TemplateURLTableModel* table_model() const {
89 return controller_->table_model(); 89 return controller_->table_model();
90 } 90 }
91 91
92 protected: 92 protected:
93 MessageLoopForUI message_loop_; 93 base::MessageLoopForUI message_loop_;
94 scoped_ptr<TestingProfile> profile_; 94 scoped_ptr<TestingProfile> profile_;
95 scoped_ptr<KeywordEditorController> controller_; 95 scoped_ptr<KeywordEditorController> controller_;
96 TemplateURLService* model_; 96 TemplateURLService* model_;
97 97
98 int model_changed_count_; 98 int model_changed_count_;
99 int items_changed_count_; 99 int items_changed_count_;
100 int added_count_; 100 int added_count_;
101 int removed_count_; 101 int removed_count_;
102 }; 102 };
103 103
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 TemplateURL* turl = new TemplateURL(profile_.get(), data); 247 TemplateURL* turl = new TemplateURL(profile_.get(), data);
248 model_->Add(turl); 248 model_->Add(turl);
249 249
250 // Table model should have updated. 250 // Table model should have updated.
251 VerifyChangeCount(1, 0, 0, 0); 251 VerifyChangeCount(1, 0, 0, 0);
252 252
253 // And should contain the newly added TemplateURL. 253 // And should contain the newly added TemplateURL.
254 ASSERT_EQ(1, table_model()->RowCount()); 254 ASSERT_EQ(1, table_model()->RowCount());
255 ASSERT_EQ(0, table_model()->IndexOfTemplateURL(turl)); 255 ASSERT_EQ(0, table_model()->IndexOfTemplateURL(turl));
256 } 256 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/search/instant_unload_handler.cc ('k') | chrome/browser/ui/startup/autolaunch_prompt_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698