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

Side by Side Diff: content/browser/site_per_process_browsertest.cc

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "content/browser/frame_host/frame_tree.h" 8 #include "content/browser/frame_host/frame_tree.h"
9 #include "content/browser/renderer_host/render_view_host_impl.h" 9 #include "content/browser/renderer_host/render_view_host_impl.h"
10 #include "content/browser/web_contents/web_contents_impl.h" 10 #include "content/browser/web_contents/web_contents_impl.h"
(...skipping 18 matching lines...) Expand all
29 29
30 class SitePerProcessWebContentsObserver: public WebContentsObserver { 30 class SitePerProcessWebContentsObserver: public WebContentsObserver {
31 public: 31 public:
32 explicit SitePerProcessWebContentsObserver(WebContents* web_contents) 32 explicit SitePerProcessWebContentsObserver(WebContents* web_contents)
33 : WebContentsObserver(web_contents), 33 : WebContentsObserver(web_contents),
34 navigation_succeeded_(true) {} 34 navigation_succeeded_(true) {}
35 virtual ~SitePerProcessWebContentsObserver() {} 35 virtual ~SitePerProcessWebContentsObserver() {}
36 36
37 virtual void DidFailProvisionalLoad( 37 virtual void DidFailProvisionalLoad(
38 int64 frame_id, 38 int64 frame_id,
39 const string16& frame_unique_name, 39 const base::string16& frame_unique_name,
40 bool is_main_frame, 40 bool is_main_frame,
41 const GURL& validated_url, 41 const GURL& validated_url,
42 int error_code, 42 int error_code,
43 const string16& error_description, 43 const base::string16& error_description,
44 RenderViewHost* render_view_host) OVERRIDE { 44 RenderViewHost* render_view_host) OVERRIDE {
45 navigation_url_ = validated_url; 45 navigation_url_ = validated_url;
46 navigation_succeeded_ = false; 46 navigation_succeeded_ = false;
47 } 47 }
48 48
49 virtual void DidCommitProvisionalLoadForFrame( 49 virtual void DidCommitProvisionalLoadForFrame(
50 int64 frame_id, 50 int64 frame_id,
51 const string16& frame_unique_name, 51 const base::string16& frame_unique_name,
52 bool is_main_frame, 52 bool is_main_frame,
53 const GURL& url, 53 const GURL& url,
54 PageTransition transition_type, 54 PageTransition transition_type,
55 RenderViewHost* render_view_host) OVERRIDE{ 55 RenderViewHost* render_view_host) OVERRIDE{
56 navigation_url_ = url; 56 navigation_url_ = url;
57 navigation_succeeded_ = true; 57 navigation_succeeded_ = true;
58 } 58 }
59 59
60 const GURL& navigation_url() const { 60 const GURL& navigation_url() const {
61 return navigation_url_; 61 return navigation_url_;
(...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 // There should be two history entries. url2b should have replaced url1. url2b 715 // There should be two history entries. url2b should have replaced url1. url2b
716 // should not have replaced url3b. 716 // should not have replaced url3b.
717 EXPECT_TRUE(controller.GetPendingEntry() == NULL); 717 EXPECT_TRUE(controller.GetPendingEntry() == NULL);
718 EXPECT_EQ(2, controller.GetEntryCount()); 718 EXPECT_EQ(2, controller.GetEntryCount());
719 EXPECT_EQ(1, controller.GetCurrentEntryIndex()); 719 EXPECT_EQ(1, controller.GetCurrentEntryIndex());
720 EXPECT_EQ(url2b, controller.GetEntryAtIndex(0)->GetURL()); 720 EXPECT_EQ(url2b, controller.GetEntryAtIndex(0)->GetURL());
721 EXPECT_EQ(url3b, controller.GetEntryAtIndex(1)->GetURL()); 721 EXPECT_EQ(url3b, controller.GetEntryAtIndex(1)->GetURL());
722 } 722 }
723 723
724 } // namespace content 724 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/site_instance_impl_unittest.cc ('k') | content/browser/speech/google_one_shot_remote_engine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698