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

Side by Side Diff: chrome/browser/history/multipart_browsertest.cc

Issue 12212048: Linux/ChromeOS Chromium style checker cleanup, chrome/browser edition. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: 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 "base/file_util.h" 5 #include "base/file_util.h"
6 #include "base/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/tabs/tab_strip_model.h" 8 #include "chrome/browser/ui/tabs/tab_strip_model.h"
9 #include "chrome/test/base/in_process_browser_test.h" 9 #include "chrome/test/base/in_process_browser_test.h"
10 #include "chrome/test/base/ui_test_utils.h" 10 #include "chrome/test/base/ui_test_utils.h"
11 #include "content/public/browser/web_contents.h" 11 #include "content/public/browser/web_contents.h"
12 #include "content/public/browser/web_contents_observer.h" 12 #include "content/public/browser/web_contents_observer.h"
13 #include "content/public/common/frame_navigate_params.h" 13 #include "content/public/common/frame_navigate_params.h"
14 #include "net/test/test_server.h" 14 #include "net/test/test_server.h"
15 15
16 class MultipartResponseTest : public InProcessBrowserTest, 16 class MultipartResponseTest : public InProcessBrowserTest,
17 public content::WebContentsObserver { 17 public content::WebContentsObserver {
18 public: 18 public:
19 MultipartResponseTest() : did_navigate_any_frame_count_(0), 19 MultipartResponseTest() : did_navigate_any_frame_count_(0),
20 update_history_count_(0) {} 20 update_history_count_(0) {}
21 21
22 void DidNavigateAnyFrame(const content::LoadCommittedDetails& details, 22 virtual void DidNavigateAnyFrame(
23 const content::FrameNavigateParams& params) { 23 const content::LoadCommittedDetails& details,
24 const content::FrameNavigateParams& params) OVERRIDE {
24 did_navigate_any_frame_count_++; 25 did_navigate_any_frame_count_++;
25 if (params.should_update_history) 26 if (params.should_update_history)
26 update_history_count_++; 27 update_history_count_++;
27 } 28 }
28 29
29 int did_navigate_any_frame_count_; 30 int did_navigate_any_frame_count_;
30 int update_history_count_; 31 int update_history_count_;
31 }; 32 };
32 33
33 // Disabled: http://crbug.com/136310 34 // Disabled: http://crbug.com/136310
34 IN_PROC_BROWSER_TEST_F(MultipartResponseTest, DISABLED_SingleVisit) { 35 IN_PROC_BROWSER_TEST_F(MultipartResponseTest, DISABLED_SingleVisit) {
35 // Make sure that visiting a multipart/x-mixed-replace site only 36 // Make sure that visiting a multipart/x-mixed-replace site only
36 // creates one entry in the visits table. 37 // creates one entry in the visits table.
37 ASSERT_TRUE(test_server()->Start()); 38 ASSERT_TRUE(test_server()->Start());
38 39
39 Observe(browser()->tab_strip_model()->GetActiveWebContents()); 40 Observe(browser()->tab_strip_model()->GetActiveWebContents());
40 ui_test_utils::NavigateToURL(browser(), test_server()->GetURL("multipart")); 41 ui_test_utils::NavigateToURL(browser(), test_server()->GetURL("multipart"));
41 42
42 EXPECT_EQ(ASCIIToUTF16("page 9"), 43 EXPECT_EQ(ASCIIToUTF16("page 9"),
43 browser()->tab_strip_model()->GetActiveWebContents()->GetTitle()); 44 browser()->tab_strip_model()->GetActiveWebContents()->GetTitle());
44 EXPECT_EQ(1, update_history_count_); 45 EXPECT_EQ(1, update_history_count_);
45 EXPECT_GT(did_navigate_any_frame_count_, update_history_count_); 46 EXPECT_GT(did_navigate_any_frame_count_, update_history_count_);
46 } 47 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698