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

Side by Side Diff: content/browser/frame_host/navigation_controller_impl_unittest.cc

Issue 1159553007: Move Tuple to base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 230
231 const GURL GetLastNavigationURL() { 231 const GURL GetLastNavigationURL() {
232 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 232 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
233 switches::kEnableBrowserSideNavigation)) { 233 switches::kEnableBrowserSideNavigation)) {
234 NavigationRequest* navigation_request = 234 NavigationRequest* navigation_request =
235 contents()->GetFrameTree()->root()->navigation_request(); 235 contents()->GetFrameTree()->root()->navigation_request();
236 CHECK(navigation_request); 236 CHECK(navigation_request);
237 return navigation_request->common_params().url; 237 return navigation_request->common_params().url;
238 } 238 }
239 const IPC::Message* message = 239 const IPC::Message* message =
240 process()->sink().GetFirstMessageMatching(FrameMsg_Navigate::ID); 240 process()->sink().GetFirstMessageMatching(FrameMsg_Navigate::ID);
241 CHECK(message); 241 CHECK(message);
242 Tuple<CommonNavigationParams, StartNavigationParams, 242 base::Tuple<CommonNavigationParams, StartNavigationParams,
243 RequestNavigationParams> nav_params; 243 RequestNavigationParams> nav_params;
244 FrameMsg_Navigate::Read(message, &nav_params); 244 FrameMsg_Navigate::Read(message, &nav_params);
245 return get<0>(nav_params).url; 245 return base::get<0>(nav_params).url;
246 } 246 }
247 247
248 protected: 248 protected:
249 GURL navigated_url_; 249 GURL navigated_url_;
250 size_t navigation_entry_committed_counter_; 250 size_t navigation_entry_committed_counter_;
251 }; 251 };
252 252
253 void RegisterForAllNavNotifications(TestNotificationTracker* tracker, 253 void RegisterForAllNavNotifications(TestNotificationTracker* tracker,
254 NavigationController* controller) { 254 NavigationController* controller) {
255 tracker->ListenFor(NOTIFICATION_NAV_LIST_PRUNED, 255 tracker->ListenFor(NOTIFICATION_NAV_LIST_PRUNED,
(...skipping 4645 matching lines...) Expand 10 before | Expand all | Expand 10 after
4901 { 4901 {
4902 LoadCommittedDetails details; 4902 LoadCommittedDetails details;
4903 controller_impl().RendererDidNavigate(main_test_rfh(), params, &details); 4903 controller_impl().RendererDidNavigate(main_test_rfh(), params, &details);
4904 EXPECT_EQ(PAGE_TYPE_ERROR, 4904 EXPECT_EQ(PAGE_TYPE_ERROR,
4905 controller_impl().GetLastCommittedEntry()->GetPageType()); 4905 controller_impl().GetLastCommittedEntry()->GetPageType());
4906 EXPECT_EQ(NAVIGATION_TYPE_IN_PAGE, details.type); 4906 EXPECT_EQ(NAVIGATION_TYPE_IN_PAGE, details.type);
4907 } 4907 }
4908 } 4908 }
4909 4909
4910 } // namespace content 4910 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698