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

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

Issue 7744039: Switch ChromeTestSuite to the same convention as ContentTestSuite: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixing Created 9 years, 4 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/string16.h" 5 #include "base/string16.h"
6 #include "base/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "chrome/browser/profiles/profile.h" 7 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/browser/search_engines/template_url.h" 8 #include "chrome/browser/search_engines/template_url.h"
9 #include "chrome/browser/search_engines/template_url_service.h" 9 #include "chrome/browser/search_engines/template_url_service.h"
10 #include "chrome/browser/search_engines/template_url_service_factory.h" 10 #include "chrome/browser/search_engines/template_url_service_factory.h"
11 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 11 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
12 #include "chrome/browser/ui/search_engines/template_url_table_model.h" 12 #include "chrome/browser/ui/search_engines/template_url_table_model.h"
13 #include "chrome/common/chrome_notification_types.h" 13 #include "chrome/common/chrome_notification_types.h"
14 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
15 #include "chrome/test/base/testing_browser_process_test.h"
16 #include "chrome/test/base/testing_pref_service.h" 15 #include "chrome/test/base/testing_pref_service.h"
17 #include "chrome/test/base/testing_profile.h" 16 #include "chrome/test/base/testing_profile.h"
18 #include "content/common/notification_details.h" 17 #include "content/common/notification_details.h"
19 #include "content/common/notification_source.h" 18 #include "content/common/notification_source.h"
20 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
21 #include "ui/base/models/table_model_observer.h" 20 #include "ui/base/models/table_model_observer.h"
22 21
23 static const string16 kA(ASCIIToUTF16("a")); 22 static const string16 kA(ASCIIToUTF16("a"));
24 static const string16 kA1(ASCIIToUTF16("a1")); 23 static const string16 kA1(ASCIIToUTF16("a1"));
25 static const string16 kB(ASCIIToUTF16("b")); 24 static const string16 kB(ASCIIToUTF16("b"));
26 static const string16 kB1(ASCIIToUTF16("b1")); 25 static const string16 kB1(ASCIIToUTF16("b1"));
27 26
28 // Base class for keyword editor tests. Creates a profile containing an 27 // Base class for keyword editor tests. Creates a profile containing an
29 // empty TemplateURLService. 28 // empty TemplateURLService.
30 class KeywordEditorControllerTest : public TestingBrowserProcessTest, 29 class KeywordEditorControllerTest : public testing::Test,
31 public ui::TableModelObserver { 30 public ui::TableModelObserver {
32 public: 31 public:
33 // Initializes all of the state. 32 // Initializes all of the state.
34 void Init(bool simulate_load_failure); 33 void Init(bool simulate_load_failure);
35 34
36 virtual void SetUp() { 35 virtual void SetUp() {
37 Init(false); 36 Init(false);
38 } 37 }
39 38
40 virtual void OnModelChanged() { 39 virtual void OnModelChanged() {
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 turl->set_short_name(ASCIIToUTF16("b")); 251 turl->set_short_name(ASCIIToUTF16("b"));
253 model_->Add(turl); 252 model_->Add(turl);
254 253
255 // Table model should have updated. 254 // Table model should have updated.
256 VerifyChangeCount(1, 0, 0, 0); 255 VerifyChangeCount(1, 0, 0, 0);
257 256
258 // And should contain the newly added TemplateURL. 257 // And should contain the newly added TemplateURL.
259 ASSERT_EQ(1, table_model()->RowCount()); 258 ASSERT_EQ(1, table_model()->RowCount());
260 ASSERT_EQ(0, table_model()->IndexOfTemplateURL(turl)); 259 ASSERT_EQ(0, table_model()->IndexOfTemplateURL(turl));
261 } 260 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698