| OLD | NEW |
| 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
| 7 #include "base/timer/timer.h" | 7 #include "base/timer/timer.h" |
| 8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
| 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| 11 #include "chrome/browser/chrome_notification_types.h" | 11 #include "chrome/browser/chrome_notification_types.h" |
| 12 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
| 13 #include "chrome/browser/profiles/profile_manager.h" | 13 #include "chrome/browser/profiles/profile_manager.h" |
| 14 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" | 14 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" |
| 15 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
| 16 #include "chrome/browser/ui/browser_commands.h" | 16 #include "chrome/browser/ui/browser_commands.h" |
| 17 #include "chrome/browser/ui/browser_window.h" | 17 #include "chrome/browser/ui/browser_window.h" |
| 18 #include "chrome/browser/ui/host_desktop.h" | |
| 19 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 18 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 20 #include "chrome/test/base/in_process_browser_test.h" | 19 #include "chrome/test/base/in_process_browser_test.h" |
| 21 #include "chrome/test/base/ui_test_utils.h" | 20 #include "chrome/test/base/ui_test_utils.h" |
| 22 #include "components/bookmarks/browser/bookmark_model.h" | 21 #include "components/bookmarks/browser/bookmark_model.h" |
| 23 #include "components/bookmarks/browser/bookmark_utils.h" | 22 #include "components/bookmarks/browser/bookmark_utils.h" |
| 24 #include "components/bookmarks/test/bookmark_test_helpers.h" | 23 #include "components/bookmarks/test/bookmark_test_helpers.h" |
| 25 #include "content/public/browser/interstitial_page.h" | 24 #include "content/public/browser/interstitial_page.h" |
| 26 #include "content/public/browser/notification_service.h" | 25 #include "content/public/browser/notification_service.h" |
| 27 #include "content/public/browser/web_contents.h" | 26 #include "content/public/browser/web_contents.h" |
| 28 #include "content/public/test/browser_test_utils.h" | 27 #include "content/public/test/browser_test_utils.h" |
| 28 #include "ui/gfx/host_desktop_type.h" |
| 29 | 29 |
| 30 using bookmarks::BookmarkModel; | 30 using bookmarks::BookmarkModel; |
| 31 | 31 |
| 32 namespace { | 32 namespace { |
| 33 const char kPersistBookmarkURL[] = "http://www.cnn.com/"; | 33 const char kPersistBookmarkURL[] = "http://www.cnn.com/"; |
| 34 const char kPersistBookmarkTitle[] = "CNN"; | 34 const char kPersistBookmarkTitle[] = "CNN"; |
| 35 } // namespace | 35 } // namespace |
| 36 | 36 |
| 37 class TestBookmarkTabHelperDelegate : public BookmarkTabHelperDelegate { | 37 class TestBookmarkTabHelperDelegate : public BookmarkTabHelperDelegate { |
| 38 public: | 38 public: |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 | 198 |
| 199 // Now go to a non-bookmarked url which triggers an SSL warning. Bookmark | 199 // Now go to a non-bookmarked url which triggers an SSL warning. Bookmark |
| 200 // star should disappear. | 200 // star should disappear. |
| 201 GURL error_url = https_server.GetURL("."); | 201 GURL error_url = https_server.GetURL("."); |
| 202 ui_test_utils::NavigateToURL(browser(), error_url); | 202 ui_test_utils::NavigateToURL(browser(), error_url); |
| 203 web_contents = browser()->tab_strip_model()->GetActiveWebContents(); | 203 web_contents = browser()->tab_strip_model()->GetActiveWebContents(); |
| 204 content::WaitForInterstitialAttach(web_contents); | 204 content::WaitForInterstitialAttach(web_contents); |
| 205 EXPECT_TRUE(web_contents->ShowingInterstitialPage()); | 205 EXPECT_TRUE(web_contents->ShowingInterstitialPage()); |
| 206 EXPECT_FALSE(bookmark_delegate.is_starred()); | 206 EXPECT_FALSE(bookmark_delegate.is_starred()); |
| 207 } | 207 } |
| OLD | NEW |