OLD | NEW |
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 <vector> | 5 #include <vector> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "chrome/browser/extensions/startup_helper.h" | 10 #include "chrome/browser/extensions/startup_helper.h" |
11 #include "chrome/common/chrome_paths.h" | 11 #include "chrome/common/chrome_paths.h" |
12 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
13 #include "chrome/test/base/in_process_browser_test.h" | 13 #include "chrome/test/base/in_process_browser_test.h" |
14 | 14 |
15 class StartupHelperBrowserTest : public InProcessBrowserTest { | 15 class StartupHelperBrowserTest : public InProcessBrowserTest { |
16 public: | 16 public: |
17 StartupHelperBrowserTest() {} | 17 StartupHelperBrowserTest() {} |
18 virtual ~StartupHelperBrowserTest() {} | 18 virtual ~StartupHelperBrowserTest() {} |
19 | 19 |
20 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 20 virtual void SetUpCommandLine(CommandLine* command_line) override { |
21 command_line->AppendSwitch(switches::kNoStartupWindow); | 21 command_line->AppendSwitch(switches::kNoStartupWindow); |
22 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_); | 22 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_); |
23 test_data_dir_ = test_data_dir_.AppendASCII("extensions"); | 23 test_data_dir_ = test_data_dir_.AppendASCII("extensions"); |
24 } | 24 } |
25 | 25 |
26 protected: | 26 protected: |
27 base::FilePath test_data_dir_; | 27 base::FilePath test_data_dir_; |
28 }; | 28 }; |
29 | 29 |
30 IN_PROC_BROWSER_TEST_F(StartupHelperBrowserTest, ValidateCrx) { | 30 IN_PROC_BROWSER_TEST_F(StartupHelperBrowserTest, ValidateCrx) { |
(...skipping 23 matching lines...) Expand all Loading... |
54 EXPECT_TRUE(result) << path.LossyDisplayName() | 54 EXPECT_TRUE(result) << path.LossyDisplayName() |
55 << " expected to be valid but wasn't"; | 55 << " expected to be valid but wasn't"; |
56 } else { | 56 } else { |
57 EXPECT_FALSE(result) << path.LossyDisplayName() | 57 EXPECT_FALSE(result) << path.LossyDisplayName() |
58 << " expected to be invalid but wasn't"; | 58 << " expected to be invalid but wasn't"; |
59 EXPECT_FALSE(error.empty()) << "Error message wasn't set for " | 59 EXPECT_FALSE(error.empty()) << "Error message wasn't set for " |
60 << path.LossyDisplayName(); | 60 << path.LossyDisplayName(); |
61 } | 61 } |
62 } | 62 } |
63 } | 63 } |
OLD | NEW |