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

Side by Side Diff: content/test/test_web_contents.h

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
« no previous file with comments | « content/test/content_browser_test_test.cc ('k') | content/test/test_web_contents.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CONTENT_TEST_TEST_WEB_CONTENTS_H_ 5 #ifndef CONTENT_TEST_TEST_WEB_CONTENTS_H_
6 #define CONTENT_TEST_TEST_WEB_CONTENTS_H_ 6 #define CONTENT_TEST_TEST_WEB_CONTENTS_H_
7 7
8 #include "content/browser/web_contents/web_contents_impl.h" 8 #include "content/browser/web_contents/web_contents_impl.h"
9 #include "content/public/common/page_transition_types.h" 9 #include "content/public/common/page_transition_types.h"
10 #include "content/public/test/web_contents_tester.h" 10 #include "content/public/test/web_contents_tester.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 // to |ExpectSetHistoryLengthAndPrune()|. 90 // to |ExpectSetHistoryLengthAndPrune()|.
91 virtual void SetHistoryLengthAndPrune(const SiteInstance* site_instance, 91 virtual void SetHistoryLengthAndPrune(const SiteInstance* site_instance,
92 int history_length, 92 int history_length,
93 int32 min_page_id) OVERRIDE; 93 int32 min_page_id) OVERRIDE;
94 94
95 void TestDidFinishLoad(int64 frame_id, const GURL& url, bool is_main_frame); 95 void TestDidFinishLoad(int64 frame_id, const GURL& url, bool is_main_frame);
96 void TestDidFailLoadWithError(int64 frame_id, 96 void TestDidFailLoadWithError(int64 frame_id,
97 const GURL& url, 97 const GURL& url,
98 bool is_main_frame, 98 bool is_main_frame,
99 int error_code, 99 int error_code,
100 const string16& error_description); 100 const base::string16& error_description);
101 101
102 protected: 102 protected:
103 // The deprecated WebContentsTester still needs to subclass this. 103 // The deprecated WebContentsTester still needs to subclass this.
104 explicit TestWebContents(BrowserContext* browser_context); 104 explicit TestWebContents(BrowserContext* browser_context);
105 105
106 private: 106 private:
107 // WebContentsImpl overrides 107 // WebContentsImpl overrides
108 virtual void CreateNewWindow( 108 virtual void CreateNewWindow(
109 int route_id, 109 int route_id,
110 int main_frame_route_id, 110 int main_frame_route_id,
(...skipping 17 matching lines...) Expand all
128 bool expect_set_history_length_and_prune_; 128 bool expect_set_history_length_and_prune_;
129 scoped_refptr<const SiteInstanceImpl> 129 scoped_refptr<const SiteInstanceImpl>
130 expect_set_history_length_and_prune_site_instance_; 130 expect_set_history_length_and_prune_site_instance_;
131 int expect_set_history_length_and_prune_history_length_; 131 int expect_set_history_length_and_prune_history_length_;
132 int32 expect_set_history_length_and_prune_min_page_id_; 132 int32 expect_set_history_length_and_prune_min_page_id_;
133 }; 133 };
134 134
135 } // namespace content 135 } // namespace content
136 136
137 #endif // CONTENT_TEST_TEST_WEB_CONTENTS_H_ 137 #endif // CONTENT_TEST_TEST_WEB_CONTENTS_H_
OLDNEW
« no previous file with comments | « content/test/content_browser_test_test.cc ('k') | content/test/test_web_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698