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

Side by Side Diff: chrome/browser/ui/search/instant_extended_interactive_uitest.cc

Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed superfluous override. Created 6 years, 5 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 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 <sstream> 5 #include <sstream>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/histogram_base.h" 8 #include "base/metrics/histogram_base.h"
9 #include "base/metrics/histogram_samples.h" 9 #include "base/metrics/histogram_samples.h"
10 #include "base/metrics/statistics_recorder.h" 10 #include "base/metrics/statistics_recorder.h"
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 }; 286 };
287 287
288 class InstantExtendedNetworkTest : public InstantExtendedTest { 288 class InstantExtendedNetworkTest : public InstantExtendedTest {
289 protected: 289 protected:
290 virtual void SetUpOnMainThread() OVERRIDE { 290 virtual void SetUpOnMainThread() OVERRIDE {
291 disable_for_test_.reset(new net::NetworkChangeNotifier::DisableForTest); 291 disable_for_test_.reset(new net::NetworkChangeNotifier::DisableForTest);
292 fake_network_change_notifier_.reset(new FakeNetworkChangeNotifier); 292 fake_network_change_notifier_.reset(new FakeNetworkChangeNotifier);
293 InstantExtendedTest::SetUpOnMainThread(); 293 InstantExtendedTest::SetUpOnMainThread();
294 } 294 }
295 295
296 virtual void CleanUpOnMainThread() OVERRIDE { 296 virtual void TearDownOnMainThread() OVERRIDE {
297 InstantExtendedTest::CleanUpOnMainThread(); 297 InstantExtendedTest::TearDownOnMainThread();
298 fake_network_change_notifier_.reset(); 298 fake_network_change_notifier_.reset();
299 disable_for_test_.reset(); 299 disable_for_test_.reset();
300 } 300 }
301 301
302 void SetConnectionType(net::NetworkChangeNotifier::ConnectionType type) { 302 void SetConnectionType(net::NetworkChangeNotifier::ConnectionType type) {
303 fake_network_change_notifier_->SetConnectionType(type); 303 fake_network_change_notifier_->SetConnectionType(type);
304 } 304 }
305 305
306 private: 306 private:
307 scoped_ptr<net::NetworkChangeNotifier::DisableForTest> disable_for_test_; 307 scoped_ptr<net::NetworkChangeNotifier::DisableForTest> disable_for_test_;
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
974 stream << "link.href = \"" << result_url.spec() << "\";"; 974 stream << "link.href = \"" << result_url.spec() << "\";";
975 stream << "document.body.appendChild(link);"; 975 stream << "document.body.appendChild(link);";
976 stream << "link.click();"; 976 stream << "link.click();";
977 EXPECT_TRUE(content::ExecuteScript(contents, stream.str())); 977 EXPECT_TRUE(content::ExecuteScript(contents, stream.str()));
978 978
979 content::WaitForLoadStop(contents); 979 content::WaitForLoadStop(contents);
980 std::string expected_title = 980 std::string expected_title =
981 "Referrer is " + instant_url().GetWithEmptyPath().spec(); 981 "Referrer is " + instant_url().GetWithEmptyPath().spec();
982 EXPECT_EQ(ASCIIToUTF16(expected_title), contents->GetTitle()); 982 EXPECT_EQ(ASCIIToUTF16(expected_title), contents->GetTitle());
983 } 983 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698