OLD | NEW |
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 "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/file_path.h" | 6 #include "base/file_path.h" |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/stringprintf.h" | 9 #include "base/stringprintf.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
11 #include "chrome/browser/extensions/extension_apitest.h" | 11 #include "chrome/browser/extensions/extension_apitest.h" |
12 #include "chrome/browser/extensions/extension_process_manager.h" | 12 #include "chrome/browser/extensions/extension_process_manager.h" |
13 #include "chrome/browser/extensions/extension_system.h" | 13 #include "chrome/browser/extensions/extension_system.h" |
14 #include "chrome/browser/extensions/platform_app_browsertest_util.h" | 14 #include "chrome/browser/extensions/platform_app_browsertest_util.h" |
15 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
16 #include "chrome/common/chrome_paths.h" | 16 #include "chrome/common/chrome_paths.h" |
17 #include "chrome/common/chrome_switches.h" | 17 #include "chrome/common/chrome_switches.h" |
18 #include "content/public/browser/render_view_host.h" | 18 #include "content/public/browser/render_view_host.h" |
19 | 19 |
20 #if defined(OS_LINUX) | 20 #if defined(OS_LINUX) |
21 #include "base/environment.h" | 21 #include "base/environment.h" |
22 #include "base/scoped_temp_dir.h" | 22 #include "base/files/scoped_temp_dir.h" |
23 #endif | 23 #endif |
24 | 24 |
25 using extensions::PlatformAppBrowserTest; | 25 using extensions::PlatformAppBrowserTest; |
26 | 26 |
27 namespace { | 27 namespace { |
28 | 28 |
29 class ExperimentalMediaGalleriesApiTest : public ExtensionApiTest { | 29 class ExperimentalMediaGalleriesApiTest : public ExtensionApiTest { |
30 public: | 30 public: |
31 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 31 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
32 ExtensionApiTest::SetUpCommandLine(command_line); | 32 ExtensionApiTest::SetUpCommandLine(command_line); |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 if (PathService::Get(kDirectoryKeys[i], &path) && | 106 if (PathService::Get(kDirectoryKeys[i], &path) && |
107 file_util::DirectoryExists(path)) { | 107 file_util::DirectoryExists(path)) { |
108 ++num_galleries_; | 108 ++num_galleries_; |
109 } | 109 } |
110 } | 110 } |
111 ASSERT_GT(num_galleries_, 0); | 111 ASSERT_GT(num_galleries_, 0); |
112 #endif | 112 #endif |
113 } | 113 } |
114 | 114 |
115 #if defined(OS_LINUX) | 115 #if defined(OS_LINUX) |
116 ScopedTempDir xdg_dir_; | 116 base::ScopedTempDir xdg_dir_; |
117 #endif | 117 #endif |
118 | 118 |
119 int num_galleries_; | 119 int num_galleries_; |
120 | 120 |
121 DISALLOW_COPY_AND_ASSIGN(EnsureMediaDirectoriesExists); | 121 DISALLOW_COPY_AND_ASSIGN(EnsureMediaDirectoriesExists); |
122 }; | 122 }; |
123 | 123 |
124 } // namespace | 124 } // namespace |
125 | 125 |
126 IN_PROC_BROWSER_TEST_F(PlatformAppMediaGalleriesBrowserTest, NoGalleries) { | 126 IN_PROC_BROWSER_TEST_F(PlatformAppMediaGalleriesBrowserTest, NoGalleries) { |
(...skipping 15 matching lines...) Expand all Loading... |
142 EnsureMediaDirectoriesExists media_directories; | 142 EnsureMediaDirectoriesExists media_directories; |
143 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/no_access")) | 143 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/no_access")) |
144 << message_; | 144 << message_; |
145 RunSecondTestPhase(media_directories.num_galleries()); | 145 RunSecondTestPhase(media_directories.num_galleries()); |
146 } | 146 } |
147 | 147 |
148 IN_PROC_BROWSER_TEST_F(ExperimentalMediaGalleriesApiTest, | 148 IN_PROC_BROWSER_TEST_F(ExperimentalMediaGalleriesApiTest, |
149 ExperimentalMediaGalleries) { | 149 ExperimentalMediaGalleries) { |
150 ASSERT_TRUE(RunExtensionTest("media_galleries/experimental")) << message_; | 150 ASSERT_TRUE(RunExtensionTest("media_galleries/experimental")) << message_; |
151 } | 151 } |
OLD | NEW |