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

Side by Side Diff: chrome_frame/test/delete_chrome_history_test.cc

Issue 12770011: Remove a few chrome dependencies of c/b/webdata (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix win compiling Created 7 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/common/chrome_constants.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <string> 5 #include <string>
6 6
7 #include "base/rand_util.h" 7 #include "base/rand_util.h"
8 #include "chrome/browser/webdata/autofill_table.h" 8 #include "chrome/browser/webdata/autofill_table.h"
9 #include "chrome/browser/webdata/web_database.h" 9 #include "chrome/browser/webdata/web_database.h"
10 #include "chrome/browser/webdata/webdata_constants.h"
10 #include "chrome/common/url_constants.h" 11 #include "chrome/common/url_constants.h"
11 #include "chrome/common/chrome_constants.h"
12 #include "chrome_frame/test/mock_ie_event_sink_actions.h" 12 #include "chrome_frame/test/mock_ie_event_sink_actions.h"
13 #include "chrome_frame/test/mock_ie_event_sink_test.h" 13 #include "chrome_frame/test/mock_ie_event_sink_test.h"
14 14
15 using testing::_; 15 using testing::_;
16 16
17 namespace chrome_frame_test { 17 namespace chrome_frame_test {
18 18
19 class DeleteBrowsingHistoryTest 19 class DeleteBrowsingHistoryTest
20 : public MockIEEventSinkTest, 20 : public MockIEEventSinkTest,
21 public testing::Test { 21 public testing::Test {
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 93
94 const size_t kBlankPngFileLength = 95; 94 const size_t kBlankPngFileLength = 95;
95 } // anonymous namespace 95 } // anonymous namespace
96 96
97 // Looks up |element_name| in the Chrome form data DB and ensures that the 97 // Looks up |element_name| in the Chrome form data DB and ensures that the
98 // results match |matcher|. 98 // results match |matcher|.
99 ACTION_P2(ExpectFormValuesForElementNameMatch, element_name, matcher) { 99 ACTION_P2(ExpectFormValuesForElementNameMatch, element_name, matcher) {
100 base::FilePath root_path; 100 base::FilePath root_path;
101 GetChromeFrameProfilePath(kIexploreProfileName, &root_path); 101 GetChromeFrameProfilePath(kIexploreProfileName, &root_path);
102 base::FilePath profile_path( 102 base::FilePath profile_path(
103 root_path.Append(L"Default").Append(chrome::kWebDataFilename)); 103 root_path.Append(L"Default").Append(kWebDataFilename));
104 104
105 AutofillTable autofill_table; 105 AutofillTable autofill_table;
106 WebDatabase web_database; 106 WebDatabase web_database;
107 web_database.AddTable(&autofill_table); 107 web_database.AddTable(&autofill_table);
108 sql::InitStatus init_status = web_database.Init(profile_path, std::string()); 108 sql::InitStatus init_status = web_database.Init(profile_path, std::string());
109 EXPECT_EQ(sql::INIT_OK, init_status); 109 EXPECT_EQ(sql::INIT_OK, init_status);
110 110
111 if (init_status == sql::INIT_OK) { 111 if (init_status == sql::INIT_OK) {
112 std::vector<string16> values; 112 std::vector<string16> values;
113 autofill_table.GetFormValuesForElementName( 113 autofill_table.GetFormValuesForElementName(
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 326
327 // Start it up. Everything else is triggered as mock actions. 327 // Start it up. Everything else is triggered as mock actions.
328 ASSERT_HRESULT_SUCCEEDED( 328 ASSERT_HRESULT_SUCCEEDED(
329 ie_mock_.event_sink()->LaunchIEAndNavigate(top_url, &ie_mock_)); 329 ie_mock_.event_sink()->LaunchIEAndNavigate(top_url, &ie_mock_));
330 330
331 // 3 navigations + 2 invocations of delete browser history == 5 331 // 3 navigations + 2 invocations of delete browser history == 5
332 loop_.RunFor(kChromeFrameLongNavigationTimeout * 5); 332 loop_.RunFor(kChromeFrameLongNavigationTimeout * 5);
333 } 333 }
334 334
335 } // namespace chrome_frame_test 335 } // namespace chrome_frame_test
OLDNEW
« no previous file with comments | « chrome/common/chrome_constants.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698