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

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

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 (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 "chrome/browser/extensions/extension_browsertest.h" 5 #include "chrome/browser/extensions/extension_browsertest.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 13 matching lines...) Expand all
24 #include "chrome/browser/extensions/extension_service.h" 24 #include "chrome/browser/extensions/extension_service.h"
25 #include "chrome/browser/extensions/extension_util.h" 25 #include "chrome/browser/extensions/extension_util.h"
26 #include "chrome/browser/extensions/unpacked_installer.h" 26 #include "chrome/browser/extensions/unpacked_installer.h"
27 #include "chrome/browser/extensions/updater/extension_cache_fake.h" 27 #include "chrome/browser/extensions/updater/extension_cache_fake.h"
28 #include "chrome/browser/extensions/updater/extension_updater.h" 28 #include "chrome/browser/extensions/updater/extension_updater.h"
29 #include "chrome/browser/profiles/profile.h" 29 #include "chrome/browser/profiles/profile.h"
30 #include "chrome/browser/profiles/profile_manager.h" 30 #include "chrome/browser/profiles/profile_manager.h"
31 #include "chrome/browser/ui/browser.h" 31 #include "chrome/browser/ui/browser.h"
32 #include "chrome/browser/ui/browser_window.h" 32 #include "chrome/browser/ui/browser_window.h"
33 #include "chrome/browser/ui/tabs/tab_strip_model.h" 33 #include "chrome/browser/ui/tabs/tab_strip_model.h"
34 #include "chrome/common/channel_info.h"
34 #include "chrome/common/chrome_paths.h" 35 #include "chrome/common/chrome_paths.h"
35 #include "chrome/common/chrome_switches.h" 36 #include "chrome/common/chrome_switches.h"
36 #include "chrome/common/chrome_version_info.h" 37 #include "components/version_info/version_info.h"
37 #include "content/public/browser/navigation_controller.h" 38 #include "content/public/browser/navigation_controller.h"
38 #include "content/public/browser/navigation_entry.h" 39 #include "content/public/browser/navigation_entry.h"
39 #include "content/public/browser/notification_registrar.h" 40 #include "content/public/browser/notification_registrar.h"
40 #include "content/public/browser/notification_service.h" 41 #include "content/public/browser/notification_service.h"
41 #include "content/public/browser/render_view_host.h" 42 #include "content/public/browser/render_view_host.h"
42 #include "content/public/test/browser_test_utils.h" 43 #include "content/public/test/browser_test_utils.h"
43 #include "content/public/test/test_utils.h" 44 #include "content/public/test/test_utils.h"
44 #include "extensions/browser/extension_host.h" 45 #include "extensions/browser/extension_host.h"
45 #include "extensions/browser/extension_prefs.h" 46 #include "extensions/browser/extension_prefs.h"
46 #include "extensions/browser/extension_registry.h" 47 #include "extensions/browser/extension_registry.h"
(...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 return extensions::browsertest_util::ExecuteScriptInBackgroundPage( 661 return extensions::browsertest_util::ExecuteScriptInBackgroundPage(
661 profile(), extension_id, script); 662 profile(), extension_id, script);
662 } 663 }
663 664
664 bool ExtensionBrowserTest::ExecuteScriptInBackgroundPageNoWait( 665 bool ExtensionBrowserTest::ExecuteScriptInBackgroundPageNoWait(
665 const std::string& extension_id, 666 const std::string& extension_id,
666 const std::string& script) { 667 const std::string& script) {
667 return extensions::browsertest_util::ExecuteScriptInBackgroundPageNoWait( 668 return extensions::browsertest_util::ExecuteScriptInBackgroundPageNoWait(
668 profile(), extension_id, script); 669 profile(), extension_id, script);
669 } 670 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698