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

Side by Side Diff: chrome/browser/policy/policy_browsertest.cc

Issue 13375003: Fixing iframe jank in the local omnibox popup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removing sites, too. Created 7 years, 8 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 <algorithm> 5 #include <algorithm>
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 864 matching lines...) Expand 10 before | Expand all | Expand 10 after
875 EXPECT_EQ(kInstantURL, default_search->instant_url()); 875 EXPECT_EQ(kInstantURL, default_search->instant_url());
876 EXPECT_EQ(2U, default_search->alternate_urls().size()); 876 EXPECT_EQ(2U, default_search->alternate_urls().size());
877 EXPECT_EQ(kAlternateURL0, default_search->alternate_urls()[0]); 877 EXPECT_EQ(kAlternateURL0, default_search->alternate_urls()[0]);
878 EXPECT_EQ(kAlternateURL1, default_search->alternate_urls()[1]); 878 EXPECT_EQ(kAlternateURL1, default_search->alternate_urls()[1]);
879 879
880 // Query terms replacement requires that the renderer process be a recognized 880 // Query terms replacement requires that the renderer process be a recognized
881 // Instant renderer. Fake it. 881 // Instant renderer. Fake it.
882 InstantService* instant_service = 882 InstantService* instant_service =
883 InstantServiceFactory::GetForProfile(browser()->profile()); 883 InstantServiceFactory::GetForProfile(browser()->profile());
884 instant_service->AddInstantProcess(browser()->tab_strip_model()-> 884 instant_service->AddInstantProcess(browser()->tab_strip_model()->
885 GetActiveWebContents()->GetRenderProcessHost()->GetID()); 885 GetActiveWebContents()->GetRenderProcessHost()->GetID(),
886 GURL("https://www.google.com/"));
886 887
887 // Verify that searching from the omnibox does search term replacement with 888 // Verify that searching from the omnibox does search term replacement with
888 // first URL pattern. 889 // first URL pattern.
889 chrome::FocusLocationBar(browser()); 890 chrome::FocusLocationBar(browser());
890 LocationBar* location_bar = browser()->window()->GetLocationBar(); 891 LocationBar* location_bar = browser()->window()->GetLocationBar();
891 ui_test_utils::SendToOmniboxAndSubmit(location_bar, 892 ui_test_utils::SendToOmniboxAndSubmit(location_bar,
892 "https://www.google.com/?espv=1#q=foobar"); 893 "https://www.google.com/?espv=1#q=foobar");
893 OmniboxEditModel* model = location_bar->GetLocationEntry()->model(); 894 OmniboxEditModel* model = location_bar->GetLocationEntry()->model();
894 EXPECT_TRUE(model->CurrentMatch().destination_url.is_valid()); 895 EXPECT_TRUE(model->CurrentMatch().destination_url.is_valid());
895 EXPECT_EQ(ASCIIToUTF16("foobar"), model->CurrentMatch().contents); 896 EXPECT_EQ(ASCIIToUTF16("foobar"), model->CurrentMatch().contents);
(...skipping 1153 matching lines...) Expand 10 before | Expand all | Expand 10 after
2049 this)); 2050 this));
2050 2051
2051 MessageLoop::current()->Run(); 2052 MessageLoop::current()->Run();
2052 } 2053 }
2053 2054
2054 INSTANTIATE_TEST_CASE_P(MediaStreamDevicesControllerBrowserTestInstance, 2055 INSTANTIATE_TEST_CASE_P(MediaStreamDevicesControllerBrowserTestInstance,
2055 MediaStreamDevicesControllerBrowserTest, 2056 MediaStreamDevicesControllerBrowserTest,
2056 testing::Bool()); 2057 testing::Bool());
2057 2058
2058 } // namespace policy 2059 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698