OLD | NEW |
1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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/threading/thread_restrictions.h" | 5 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" |
| 6 |
| 7 #include "base/command_line.h" |
6 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
7 #include "chrome/browser/signin/fake_signin_manager_builder.h" | 9 #include "chrome/browser/signin/fake_signin_manager_builder.h" |
8 #include "chrome/browser/signin/signin_manager_factory.h" | 10 #include "chrome/browser/signin/signin_manager_factory.h" |
9 #include "chrome/browser/ui/test/test_browser_dialog.h" | 11 #include "chrome/browser/ui/test/test_browser_dialog.h" |
10 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" | |
11 #include "chrome/browser/ui/views/frame/browser_view.h" | 12 #include "chrome/browser/ui/views/frame/browser_view.h" |
12 #include "chrome/browser/ui/views/location_bar/star_view.h" | 13 #include "chrome/browser/ui/views/location_bar/star_view.h" |
13 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" | 14 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" |
14 #include "chrome/test/base/browser_with_test_window_test.h" | 15 #include "chrome/common/chrome_switches.h" |
| 16 #include "chrome/test/base/testing_profile.h" |
| 17 #include "components/bookmarks/browser/bookmark_model.h" |
15 #include "components/bookmarks/browser/bookmark_utils.h" | 18 #include "components/bookmarks/browser/bookmark_utils.h" |
16 #include "components/bookmarks/test/bookmark_test_helpers.h" | 19 #include "components/bookmarks/test/bookmark_test_helpers.h" |
17 | 20 |
18 #if defined(OS_WIN) | |
19 #include "chrome/browser/ui/desktop_ios_promotion/desktop_ios_promotion_util.h" | |
20 #endif | |
21 | |
22 namespace { | 21 namespace { |
23 | 22 |
24 const char kTestBookmarkURL[] = "http://www.google.com"; | 23 const char kTestBookmarkURL[] = "http://www.google.com"; |
25 const char kTestGaiaID[] = "test"; | 24 const char kTestGaiaID[] = "test"; |
26 const char kTestUserEmail[] = "testuser@gtest.com"; | 25 const char kTestUserEmail[] = "testuser@gtest.com"; |
27 | 26 |
28 } // namespace | 27 } // namespace |
29 | 28 |
30 class BookmarkBubbleViewBrowserTest : public DialogBrowserTest { | 29 class BookmarkBubbleViewBrowserTest : public DialogBrowserTest { |
31 public: | 30 public: |
32 BookmarkBubbleViewBrowserTest() {} | 31 BookmarkBubbleViewBrowserTest() {} |
33 | 32 |
34 void SetUpOnMainThread() override { | 33 void SetUpOnMainThread() override { |
35 TestingProfile::Builder builder; | 34 TestingProfile::Builder builder; |
36 builder.AddTestingFactory(SigninManagerFactory::GetInstance(), | 35 builder.AddTestingFactory(SigninManagerFactory::GetInstance(), |
37 BuildFakeSigninManagerBase); | 36 BuildFakeSigninManagerBase); |
38 profile_ = builder.Build(); | 37 profile_ = builder.Build(); |
39 profile_->CreateBookmarkModel(true); | 38 profile_->CreateBookmarkModel(true); |
40 bookmarks::BookmarkModel* bookmark_model = | 39 bookmarks::BookmarkModel* bookmark_model = |
41 BookmarkModelFactory::GetForBrowserContext(profile_.get()); | 40 BookmarkModelFactory::GetForBrowserContext(profile_.get()); |
42 bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model); | 41 bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model); |
| 42 // Don't persist bookmark changes to disk. BookmarkStorage does its writes |
| 43 // on the UI thread, which violates base::ThreadRestrictions. |
| 44 bookmark_model->ClearStore(); |
43 bookmarks::AddIfNotBookmarked(bookmark_model, GURL(kTestBookmarkURL), | 45 bookmarks::AddIfNotBookmarked(bookmark_model, GURL(kTestBookmarkURL), |
44 base::string16()); | 46 base::string16()); |
45 } | 47 } |
46 | 48 |
47 void TearDownOnMainThread() override { profile_.reset(); } | 49 void TearDownOnMainThread() override { profile_.reset(); } |
48 | 50 |
| 51 // DialogBrowserTest: |
49 void ShowDialog(const std::string& name) override { | 52 void ShowDialog(const std::string& name) override { |
50 BrowserView* browser_view = | 53 if (name == "bookmark_details") { |
51 BrowserView::GetBrowserViewForBrowser(browser()); | |
52 | |
53 if ("bookmark_details" == name) { | |
54 #if !defined(OS_CHROMEOS) | 54 #if !defined(OS_CHROMEOS) |
55 SigninManagerFactory::GetForProfile(profile_.get()) | 55 SigninManagerFactory::GetForProfile(profile_.get()) |
56 ->SignOut(signin_metrics::SIGNOUT_TEST, | 56 ->SignOut(signin_metrics::SIGNOUT_TEST, |
57 signin_metrics::SignoutDelete::IGNORE_METRIC); | 57 signin_metrics::SignoutDelete::IGNORE_METRIC); |
58 #endif | 58 #endif |
59 BookmarkBubbleView::ShowBubble( | 59 } else { |
60 browser_view->toolbar()->location_bar()->star_view(), gfx::Rect(), | |
61 nullptr, nullptr, nullptr, profile_.get(), GURL(kTestBookmarkURL), | |
62 true); | |
63 } else if ("bookmark_details_signed_in" == name) { | |
64 SigninManagerFactory::GetForProfile(profile_.get()) | 60 SigninManagerFactory::GetForProfile(profile_.get()) |
65 ->SetAuthenticatedAccountInfo(kTestGaiaID, kTestUserEmail); | 61 ->SetAuthenticatedAccountInfo(kTestGaiaID, kTestUserEmail); |
66 BookmarkBubbleView::ShowBubble( | 62 } |
67 browser_view->toolbar()->location_bar()->star_view(), gfx::Rect(), | 63 |
68 nullptr, nullptr, nullptr, profile_.get(), GURL(kTestBookmarkURL), | 64 BrowserView* browser_view = |
69 true); | 65 BrowserView::GetBrowserViewForBrowser(browser()); |
70 #if defined(OS_WIN) | 66 BookmarkBubbleView::ShowBubble( |
71 } else if ("ios_promotion" == name) { | 67 browser_view->toolbar()->location_bar()->star_view(), gfx::Rect(), |
72 SigninManagerFactory::GetForProfile(profile_.get()) | 68 nullptr, nullptr, nullptr, profile_.get(), GURL(kTestBookmarkURL), |
73 ->SetAuthenticatedAccountInfo(kTestGaiaID, kTestUserEmail); | 69 true); |
74 BookmarkBubbleView::ShowBubble( | 70 if (name == "ios_promotion") { |
75 browser_view->toolbar()->location_bar()->star_view(), gfx::Rect(), | 71 BookmarkBubbleView::bookmark_bubble()->HandleButtonPressed( |
76 nullptr, nullptr, nullptr, profile_.get(), GURL(kTestBookmarkURL), | 72 BookmarkBubbleView::bookmark_bubble()->save_button_); |
77 true); | |
78 BookmarkBubbleView::bookmark_bubble()->ShowIOSPromotion( | |
79 desktop_ios_promotion::PromotionEntryPoint::BOOKMARKS_BUBBLE); | |
80 #endif | |
81 } | 73 } |
82 } | 74 } |
83 | 75 |
84 private: | 76 private: |
85 std::unique_ptr<TestingProfile> profile_; | 77 std::unique_ptr<TestingProfile> profile_; |
| 78 |
86 DISALLOW_COPY_AND_ASSIGN(BookmarkBubbleViewBrowserTest); | 79 DISALLOW_COPY_AND_ASSIGN(BookmarkBubbleViewBrowserTest); |
87 }; | 80 }; |
88 | 81 |
89 IN_PROC_BROWSER_TEST_F(BookmarkBubbleViewBrowserTest, | 82 IN_PROC_BROWSER_TEST_F(BookmarkBubbleViewBrowserTest, |
90 InvokeDialog_bookmark_details) { | 83 InvokeDialog_bookmark_details) { |
91 base::ThreadRestrictions::ScopedAllowIO allow_io; | |
92 RunDialog(); | 84 RunDialog(); |
93 } | 85 } |
94 | 86 |
95 IN_PROC_BROWSER_TEST_F(BookmarkBubbleViewBrowserTest, | 87 IN_PROC_BROWSER_TEST_F(BookmarkBubbleViewBrowserTest, |
96 InvokeDialog_bookmark_details_signed_in) { | 88 InvokeDialog_bookmark_details_signed_in) { |
97 base::ThreadRestrictions::ScopedAllowIO allow_io; | |
98 RunDialog(); | 89 RunDialog(); |
99 } | 90 } |
100 | 91 |
101 #if defined(OS_WIN) | 92 #if defined(OS_WIN) |
102 IN_PROC_BROWSER_TEST_F(BookmarkBubbleViewBrowserTest, | 93 IN_PROC_BROWSER_TEST_F(BookmarkBubbleViewBrowserTest, |
103 InvokeDialog_ios_promotion) { | 94 InvokeDialog_ios_promotion) { |
104 base::ThreadRestrictions::ScopedAllowIO allow_io; | 95 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
| 96 switches::kForceDesktopIOSPromotion); |
105 RunDialog(); | 97 RunDialog(); |
106 } | 98 } |
107 #endif | 99 #endif |
OLD | NEW |