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

Side by Side Diff: chrome/browser/chromeos/extensions/wallpaper_manager_browsertest.cc

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/files/file_path.h" 5 #include "base/files/file_path.h"
6 #include "chrome/browser/apps/app_browsertest_util.h" 6 #include "chrome/browser/apps/app_browsertest_util.h"
7 #include "chrome/browser/extensions/component_loader.h" 7 #include "chrome/browser/extensions/component_loader.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/ui/tabs/tab_strip_model.h" 9 #include "chrome/browser/ui/tabs/tab_strip_model.h"
10 #include "chrome/test/base/ui_test_utils.h" 10 #include "chrome/test/base/ui_test_utils.h"
11 #include "components/version_info/version_info.h"
11 #include "content/public/test/browser_test_utils.h" 12 #include "content/public/test/browser_test_utils.h"
12 #include "extensions/browser/extension_registry.h" 13 #include "extensions/browser/extension_registry.h"
13 #include "extensions/test/extension_test_message_listener.h" 14 #include "extensions/test/extension_test_message_listener.h"
14 #include "grit/browser_resources.h" 15 #include "grit/browser_resources.h"
15 16
16 using extensions::Extension; 17 using extensions::Extension;
17 using extensions::ExtensionRegistry; 18 using extensions::ExtensionRegistry;
18 19
19 namespace { 20 namespace {
20 const char kWallpaperManagerExtensionID[] = "obklkkbkpaoaejdabbfldmcfplpdgolj"; 21 const char kWallpaperManagerExtensionID[] = "obklkkbkpaoaejdabbfldmcfplpdgolj";
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 ASSERT_TRUE(web_contents); 86 ASSERT_TRUE(web_contents);
86 87
87 const std::vector<int> empty_libraries; 88 const std::vector<int> empty_libraries;
88 EXPECT_TRUE(ExecuteWebUIResourceTest(web_contents, empty_libraries)); 89 EXPECT_TRUE(ExecuteWebUIResourceTest(web_contents, empty_libraries));
89 } 90 }
90 }; 91 };
91 92
92 IN_PROC_BROWSER_TEST_F(WallpaperManagerJsTest, EventPageTest) { 93 IN_PROC_BROWSER_TEST_F(WallpaperManagerJsTest, EventPageTest) {
93 RunTest(base::FilePath(FILE_PATH_LITERAL("event_page_unittest.html"))); 94 RunTest(base::FilePath(FILE_PATH_LITERAL("event_page_unittest.html")));
94 } 95 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/drive/drive_integration_service.cc ('k') | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698