diff options
-rw-r--r-- | chrome/browser/bookmark_bar_model.cc | 6 | ||||
-rw-r--r-- | chrome/browser/bookmark_storage.cc | 4 | ||||
-rw-r--r-- | chrome/browser/views/bookmark_bar_view_test.cc | 7 | ||||
-rw-r--r-- | chrome/chrome.sln | 23 | ||||
-rw-r--r-- | chrome/chrome_kjs.sln | 23 | ||||
-rw-r--r-- | chrome/test/interactive_ui/interactive_ui.vcproj | 28 | ||||
-rw-r--r-- | chrome/test/interactive_ui/view_event_test_base.cc (renamed from chrome/test/ui/view_event_test_base.cc) | 8 | ||||
-rw-r--r-- | chrome/test/interactive_ui/view_event_test_base.h (renamed from chrome/test/ui/view_event_test_base.h) | 15 | ||||
-rw-r--r-- | chrome/test/unit/unittests.vcproj | 16 |
9 files changed, 91 insertions, 39 deletions
diff --git a/chrome/browser/bookmark_bar_model.cc b/chrome/browser/bookmark_bar_model.cc index e597d10..25612eb 100644 --- a/chrome/browser/bookmark_bar_model.cc +++ b/chrome/browser/bookmark_bar_model.cc @@ -393,14 +393,14 @@ void BookmarkBarModel::OnBookmarkStorageLoadedBookmarks( if (file_exists || loaded_from_history || !profile_ || !profile_->GetHistoryService(Profile::EXPLICIT_ACCESS)) { + // The file exists, we're loaded. + DoneLoading(); + if (loaded_from_history) { // We were just populated from the historical file. Schedule a save so // that the main file is up to date. store_->ScheduleSave(); } - - // The file exists, we're loaded. - DoneLoading(); return; } diff --git a/chrome/browser/bookmark_storage.cc b/chrome/browser/bookmark_storage.cc index e9d3395..32bda99 100644 --- a/chrome/browser/bookmark_storage.cc +++ b/chrome/browser/bookmark_storage.cc @@ -55,7 +55,9 @@ void BookmarkStorage::LoadBookmarks(bool load_from_history) { } void BookmarkStorage::ScheduleSave() { - if (save_factory_.empty()) { + if (!backend_thread()) { + SaveNow(); + } else if (save_factory_.empty()) { MessageLoop::current()->PostDelayedTask( FROM_HERE, save_factory_.NewRunnableMethod(&BookmarkStorage::SaveNow), kSaveDelayMS); diff --git a/chrome/browser/views/bookmark_bar_view_test.cc b/chrome/browser/views/bookmark_bar_view_test.cc index b6571c6..ca24a3b 100644 --- a/chrome/browser/views/bookmark_bar_view_test.cc +++ b/chrome/browser/views/bookmark_bar_view_test.cc @@ -11,7 +11,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/test/testing_profile.h" -#include "chrome/test/ui/view_event_test_base.h" +#include "chrome/test/interactive_ui/view_event_test_base.h" #include "chrome/views/chrome_menu.h" #include "chrome/views/text_button.h" #include "chrome/views/window.h" @@ -334,8 +334,6 @@ class BookmarkBarViewTest3 : public BookmarkBarViewEventTestBase { // Hide menu. menu->GetMenuController()->Cancel(true); - // Because of the nested loop run by the menu we need to invoke done twice. - Done(); Done(); } }; @@ -390,8 +388,6 @@ class BookmarkBarViewTest4 : public BookmarkBarViewEventTestBase { ASSERT_TRUE(navigator_.url_ == model_->other_node()->GetChild(0)->GetURL()); - // Because of the nested loop we invoke done twice here. - Done(); Done(); } }; @@ -831,4 +827,3 @@ class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase { }; VIEW_TEST(BookmarkBarViewTest10, KeyEvents) - diff --git a/chrome/chrome.sln b/chrome/chrome.sln index 84af380..246e950 100644 --- a/chrome/chrome.sln +++ b/chrome/chrome.sln @@ -585,20 +585,43 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interactive_ui_tests", "tes ProjectSection(ProjectDependencies) = postProject {1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12} {1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165} + {1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6} + {20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A} + {238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601} {2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE} {326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243} + {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} + {5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700} + {57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6} + {5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6} {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} + {625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0} + {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} + {6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751} {7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D} {7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC} + {7F0A70F6-BE3F-4C19-B435-956AB8F30BA4} = {7F0A70F6-BE3F-4C19-B435-956AB8F30BA4} {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} {899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146} {8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308} + {9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D} {A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551} + {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6} + {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} + {BF4F447B-72B5-4059-BE1B-F94337B1F385} = {BF4F447B-72B5-4059-BE1B-F94337B1F385} {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} + {C0334F9A-1168-4101-9DD8-C30FB252D435} = {C0334F9A-1168-4101-9DD8-C30FB252D435} {C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD} + {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} + {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} {CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D} + {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} {EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C} + {EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC} + {F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51} {FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22} + {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} + {FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer", "Installer", "{EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}" diff --git a/chrome/chrome_kjs.sln b/chrome/chrome_kjs.sln index 555f58d..ab358f4 100644 --- a/chrome/chrome_kjs.sln +++ b/chrome/chrome_kjs.sln @@ -587,22 +587,45 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin_tests", "test\plugin EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interactive_ui_tests", "test\interactive_ui\interactive_ui.vcproj", "{018D4F38-6272-448F-A864-976DA09F05D0}" ProjectSection(ProjectDependencies) = postProject + {011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5} {1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12} {1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165} + {1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6} + {20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A} + {238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601} {2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE} {326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243} + {369B9881-3F2C-464D-A96C-E281405DF8F6} = {369B9881-3F2C-464D-A96C-E281405DF8F6} + {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} + {5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700} + {5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6} {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} + {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} + {6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751} {7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D} {7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC} + {7F0A70F6-BE3F-4C19-B435-956AB8F30BA4} = {7F0A70F6-BE3F-4C19-B435-956AB8F30BA4} {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} + {867F64C9-D631-41A9-B467-13D6378A72AA} = {867F64C9-D631-41A9-B467-13D6378A72AA} {899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146} {8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308} + {9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D} {A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551} + {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6} + {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} + {BF4F447B-72B5-4059-BE1B-F94337B1F385} = {BF4F447B-72B5-4059-BE1B-F94337B1F385} {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} {C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD} + {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} + {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} {CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D} + {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} {EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C} + {EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC} + {F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51} {FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22} + {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} + {FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer", "Installer", "{EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}" diff --git a/chrome/test/interactive_ui/interactive_ui.vcproj b/chrome/test/interactive_ui/interactive_ui.vcproj index 7be44ab..5449a05 100644 --- a/chrome/test/interactive_ui/interactive_ui.vcproj +++ b/chrome/test/interactive_ui/interactive_ui.vcproj @@ -17,7 +17,7 @@ <Configuration Name="Debug|Win32" ConfigurationType="1" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;..\..\tools\build\win\precompiled_wtl.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\libxslt\build\using_libxslt.vsprops;..\..\tools\build\win\unit_test.vsprops;..\..\tools\build\win\ui_test.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;..\..\tools\build\win\precompiled_wtl.vsprops;..\..\tools\build\win\unit_test.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;..\..\..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;..\..\third_party\hunspell\using_hunspell.vsprops" > <Tool Name="VCPreBuildEventTool" @@ -77,7 +77,7 @@ <Configuration Name="Release|Win32" ConfigurationType="1" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\libxslt\build\using_libxslt.vsprops;..\..\tools\build\win\unit_test.vsprops;..\..\tools\build\win\ui_test.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;..\..\tools\build\win\unit_test.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;..\..\..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;..\..\third_party\hunspell\using_hunspell.vsprops" > <Tool Name="VCPreBuildEventTool" @@ -167,6 +167,14 @@ > </File> <File + RelativePath="..\testing_profile.cc" + > + </File> + <File + RelativePath="..\testing_profile.h" + > + </File> + <File RelativePath="..\ui\ui_test.cc" > </File> @@ -178,6 +186,22 @@ RelativePath="..\ui\ui_test_suite.cc" > </File> + <File + RelativePath=".\view_event_test_base.cc" + > + </File> + <File + RelativePath=".\view_event_test_base.h" + > + </File> + </Filter> + <Filter + Name="TestBookmarkBarView" + > + <File + RelativePath="..\..\browser\views\bookmark_bar_view_test.cc" + > + </File> </Filter> <Filter Name="TestFindInPage" diff --git a/chrome/test/ui/view_event_test_base.cc b/chrome/test/interactive_ui/view_event_test_base.cc index a702ea3..8cf9e61 100644 --- a/chrome/test/ui/view_event_test_base.cc +++ b/chrome/test/interactive_ui/view_event_test_base.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/test/ui/view_event_test_base.h" +#include "chrome/test/interactive_ui/view_event_test_base.h" #include "base/message_loop.h" #include "chrome/browser/automation/ui_controls.h" @@ -38,7 +38,10 @@ const int kMouseMoveDelayMS = 200; // static void ViewEventTestBase::Done() { MessageLoop::current()->Quit(); - MessageLoop::current()->Quit(); + // If we're in a nested message loop, as is the case with menus, we need + // to quit twice. The second quit does that for us. + MessageLoop::current()->PostDelayedTask( + FROM_HERE, new MessageLoop::QuitTask(), 0); } ViewEventTestBase::ViewEventTestBase() : window_(NULL), content_view_(NULL) { } @@ -113,4 +116,3 @@ void ViewEventTestBase::RunTestMethod(Task* task) { if (HasFatalFailure()) Done(); } - diff --git a/chrome/test/ui/view_event_test_base.h b/chrome/test/interactive_ui/view_event_test_base.h index e89f734..28b5a5e 100644 --- a/chrome/test/ui/view_event_test_base.h +++ b/chrome/test/interactive_ui/view_event_test_base.h @@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_UI_VIEW_EVENT_TEST_BASE_H_ -#define CHROME_TEST_UI_VIEW_EVENT_TEST_BASE_H_ +#ifndef CHROME_TEST_INTERACTIVE_UI_VIEW_EVENT_TEST_BASE_H_ +#define CHROME_TEST_INTERACTIVE_UI_VIEW_EVENT_TEST_BASE_H_ +#include "base/message_loop.h" #include "base/thread.h" #include "chrome/views/window_delegate.h" #include "testing/gtest/include/gtest/gtest.h" @@ -123,18 +124,16 @@ class ViewEventTestBase : public ChromeViews::WindowDelegate, // Thread for posting background MouseMoves. scoped_ptr<base::Thread> dnd_thread_; + MessageLoopForUI message_loop_; + DISALLOW_COPY_AND_ASSIGN(ViewEventTestBase); }; // Convenience macro for defining a ViewEventTestBase. See class description // of ViewEventTestBase for details. -// -// NOTE: These tests are disabled until we get a buildbot that is always logged -// in and can run them. #define VIEW_TEST(test_class, name) \ - TEST_F(test_class, DISABLED_name) {\ + TEST_F(test_class, name) {\ StartMessageLoopAndRunTest();\ } -#endif // CHROME_TEST_UI_VIEW_EVENT_TEST_BASE_H_ - +#endif // CHROME_TEST_INTERACTIVE_UI_VIEW_EVENT_TEST_BASE_H_ diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj index c84a572..fee3966 100644 --- a/chrome/test/unit/unittests.vcproj +++ b/chrome/test/unit/unittests.vcproj @@ -209,14 +209,6 @@ RelativePath="..\..\..\net\url_request\url_request_test_job.h" > </File> - <File - RelativePath="..\ui\view_event_test_base.cc" - > - </File> - <File - RelativePath="..\ui\view_event_test_base.h" - > - </File> </Filter> <Filter Name="TestBookmarkBarContextMenuController" @@ -227,14 +219,6 @@ </File> </Filter> <Filter - Name="TestBookmarkBarView" - > - <File - RelativePath="..\..\browser\views\bookmark_bar_view_test.cc" - > - </File> - </Filter> - <Filter Name="TestBookmarkEditorView" > <File |