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

Side by Side Diff: chrome/browser/extensions/activity_log_browsertest.cc

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "chrome/browser/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 #include "chrome/browser/extensions/extension_browsertest.h" 6 #include "chrome/browser/extensions/extension_browsertest.h"
7 #include "chrome/browser/ui/tabs/tab_strip_model.h" 7 #include "chrome/browser/ui/tabs/tab_strip_model.h"
8 #include "chrome/common/chrome_switches.h" 8 #include "chrome/common/chrome_switches.h"
9 #include "chrome/test/base/ui_test_utils.h" 9 #include "chrome/test/base/ui_test_utils.h"
10 #include "content/public/test/browser_test_utils.h" 10 #include "content/public/test/browser_test_utils.h"
11 #include "net/base/mock_host_resolver.h" 11 #include "net/dns/mock_host_resolver.h"
12 12
13 // Used to fire all of the listeners on the buttons. 13 // Used to fire all of the listeners on the buttons.
14 static const char kScriptClickAllTestButtons[] = 14 static const char kScriptClickAllTestButtons[] =
15 "(function() {" 15 "(function() {"
16 " setRunningAsRobot();" 16 " setRunningAsRobot();"
17 " var buttons = document.getElementsByTagName('button');" 17 " var buttons = document.getElementsByTagName('button');"
18 " for (var i=0; i < buttons.length; i++) {" 18 " for (var i=0; i < buttons.length; i++) {"
19 " buttons[i].click();" 19 " buttons[i].click();"
20 " }" 20 " }"
21 "})();"; 21 "})();";
(...skipping 25 matching lines...) Expand all
47 TabStripModel* tab_strip = browser()->tab_strip_model(); 47 TabStripModel* tab_strip = browser()->tab_strip_model();
48 48
49 // Run the test by firing all the buttons. Wait until completion. 49 // Run the test by firing all the buttons. Wait until completion.
50 ResultCatcher catcher; 50 ResultCatcher catcher;
51 ASSERT_TRUE(content::ExecuteScript(tab_strip->GetActiveWebContents(), 51 ASSERT_TRUE(content::ExecuteScript(tab_strip->GetActiveWebContents(),
52 kScriptClickAllTestButtons)); 52 kScriptClickAllTestButtons));
53 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); 53 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
54 } 54 }
55 55
56 } // namespace extensions 56 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698