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

Side by Side Diff: chrome/browser/ui/bookmarks/bookmark_prompt_controller_unittest.cc

Issue 12066003: Remove TabStripModel wrapper use. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gtk Created 7 years, 10 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/ui/bookmarks/bookmark_prompt_controller.h" 5 #include "chrome/browser/ui/bookmarks/bookmark_prompt_controller.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/metrics/field_trial.h" 8 #include "base/metrics/field_trial.h"
9 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h" 9 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/prefs/pref_service.h" 11 #include "chrome/browser/prefs/pref_service.h"
12 #include "chrome/browser/ui/browser.h"
12 #include "chrome/browser/ui/browser_list.h" 13 #include "chrome/browser/ui/browser_list.h"
13 #include "chrome/browser/ui/browser_tabstrip.h" 14 #include "chrome/browser/ui/tabs/tab_strip_model.h"
14 #include "chrome/test/base/browser_with_test_window_test.h" 15 #include "chrome/test/base/browser_with_test_window_test.h"
15 #include "chrome/test/base/testing_browser_process.h" 16 #include "chrome/test/base/testing_browser_process.h"
16 #include "chrome/test/base/test_browser_window.h" 17 #include "chrome/test/base/test_browser_window.h"
17 #include "content/public/browser/notification_service.h" 18 #include "content/public/browser/notification_service.h"
18 #include "content/public/browser/web_contents.h" 19 #include "content/public/browser/web_contents.h"
19 20
20 class BookmarkPromptControllerTest : public BrowserWithTestWindowTest { 21 class BookmarkPromptControllerTest : public BrowserWithTestWindowTest {
21 public: 22 public:
22 BookmarkPromptControllerTest() : field_trial_list_(NULL), page_id_(0) { 23 BookmarkPromptControllerTest() : field_trial_list_(NULL), page_id_(0) {
23 base::FieldTrialList::CreateFieldTrial("BookmarkPrompt", "Experiment"); 24 base::FieldTrialList::CreateFieldTrial("BookmarkPrompt", "Experiment");
24 } 25 }
25 26
26 protected: 27 protected:
27 int show_prompt_call_count() const { 28 int show_prompt_call_count() const {
28 return static_cast<MyTestBrowserWindow*>(browser()->window())-> 29 return static_cast<MyTestBrowserWindow*>(browser()->window())->
29 show_prompt_call_count(); 30 show_prompt_call_count();
30 } 31 }
31 32
32 void Visit(const GURL& url) { 33 void Visit(const GURL& url) {
33 AddTab(browser(), url); 34 AddTab(browser(), url);
34 35
35 // Simulate page loaded. 36 // Simulate page loaded.
36 ++page_id_; 37 ++page_id_;
37 content::WebContents* web_contents = 38 content::WebContents* web_contents =
38 chrome::GetActiveWebContents(browser()); 39 browser()->tab_strip_model()->GetActiveWebContents();
39 content::NotificationService::current()->Notify( 40 content::NotificationService::current()->Notify(
40 content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME, 41 content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
41 content::Source<content::WebContents>(web_contents), 42 content::Source<content::WebContents>(web_contents),
42 content::Details<int>(&page_id_)); 43 content::Details<int>(&page_id_));
43 44
44 // Wait until HistoryService::QueryURL completion. 45 // Wait until HistoryService::QueryURL completion.
45 static_cast<TestingProfile*>(browser()->profile())-> 46 static_cast<TestingProfile*>(browser()->profile())->
46 BlockUntilHistoryProcessesPendingRequests(); 47 BlockUntilHistoryProcessesPendingRequests();
47 } 48 }
48 49
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 EXPECT_EQ(1, show_prompt_call_count()); 129 EXPECT_EQ(1, show_prompt_call_count());
129 EXPECT_EQ(1, prefs.GetPromptImpressionCount()); 130 EXPECT_EQ(1, prefs.GetPromptImpressionCount());
130 } 131 }
131 } 132 }
132 133
133 Visit(url); 134 Visit(url);
134 135
135 EXPECT_EQ(2, show_prompt_call_count()); 136 EXPECT_EQ(2, show_prompt_call_count());
136 EXPECT_EQ(2, prefs.GetPromptImpressionCount()); 137 EXPECT_EQ(2, prefs.GetPromptImpressionCount());
137 } 138 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698