| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/values.h" | 6 #include "base/values.h" |
| 7 #include "chrome/browser/extensions/extension_apitest.h" | 7 #include "chrome/browser/extensions/extension_apitest.h" |
| 8 #include "chrome/common/extensions/api/search_engines_private.h" | 8 #include "chrome/common/extensions/api/search_engines_private.h" |
| 9 #include "components/keyed_service/core/keyed_service.h" | 9 #include "components/keyed_service/core/keyed_service.h" |
| 10 #include "content/public/test/test_utils.h" | 10 #include "content/public/test/test_utils.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 "main.html?" + subtest, | 34 "main.html?" + subtest, |
| 35 kFlagLoadAsComponent); | 35 kFlagLoadAsComponent); |
| 36 } | 36 } |
| 37 | 37 |
| 38 private: | 38 private: |
| 39 DISALLOW_COPY_AND_ASSIGN(SearchEnginesPrivateApiTest); | 39 DISALLOW_COPY_AND_ASSIGN(SearchEnginesPrivateApiTest); |
| 40 }; | 40 }; |
| 41 | 41 |
| 42 } // namespace | 42 } // namespace |
| 43 | 43 |
| 44 IN_PROC_BROWSER_TEST_F(SearchEnginesPrivateApiTest, | 44 IN_PROC_BROWSER_TEST_F(SearchEnginesPrivateApiTest, SetSelectedSearchEngine) { |
| 45 DISABLED_SetSelectedSearchEngine) { | |
| 46 EXPECT_TRUE(RunSearchEnginesSubtest("setSelectedSearchEngine")) << message_; | 45 EXPECT_TRUE(RunSearchEnginesSubtest("setSelectedSearchEngine")) << message_; |
| 47 } | 46 } |
| 48 | 47 |
| 49 IN_PROC_BROWSER_TEST_F(SearchEnginesPrivateApiTest, | 48 IN_PROC_BROWSER_TEST_F(SearchEnginesPrivateApiTest, OnSearchEnginesChanged) { |
| 50 DISABLED_OnDefaultSearchEnginesChanged) { | |
| 51 EXPECT_TRUE(RunSearchEnginesSubtest("onDefaultSearchEnginesChanged")) | 49 EXPECT_TRUE(RunSearchEnginesSubtest("onDefaultSearchEnginesChanged")) |
| 52 << message_; | 50 << message_; |
| 53 } | 51 } |
| 54 | 52 |
| 53 IN_PROC_BROWSER_TEST_F(SearchEnginesPrivateApiTest, AddNewSearchEngine) { |
| 54 EXPECT_TRUE(RunSearchEnginesSubtest("addNewSearchEngine")) << message_; |
| 55 } |
| 56 |
| 57 IN_PROC_BROWSER_TEST_F(SearchEnginesPrivateApiTest, UpdateSearchEngine) { |
| 58 EXPECT_TRUE(RunSearchEnginesSubtest("updateSearchEngine")) << message_; |
| 59 } |
| 60 |
| 61 IN_PROC_BROWSER_TEST_F(SearchEnginesPrivateApiTest, RemoveSearchEngine) { |
| 62 EXPECT_TRUE(RunSearchEnginesSubtest("removeSearchEngine")) << message_; |
| 63 } |
| 64 |
| 55 } // namespace extensions | 65 } // namespace extensions |
| OLD | NEW |