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

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

Issue 113143006: Add base:: to string16 in chrome_frame/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
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/common/url_constants.h" 8 #include "chrome/common/url_constants.h"
9 #include "chrome_frame/test/mock_ie_event_sink_actions.h" 9 #include "chrome_frame/test/mock_ie_event_sink_actions.h"
10 #include "chrome_frame/test/mock_ie_event_sink_test.h" 10 #include "chrome_frame/test/mock_ie_event_sink_test.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 base::FilePath profile_path( 102 base::FilePath profile_path(
103 root_path.Append(L"Default").Append(kWebDataFilename)); 103 root_path.Append(L"Default").Append(kWebDataFilename));
104 104
105 autofill::AutofillTable autofill_table("en-US"); 105 autofill::AutofillTable autofill_table("en-US");
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); 108 sql::InitStatus init_status = web_database.Init(profile_path);
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<base::string16> values;
113 autofill_table.GetFormValuesForElementName( 113 autofill_table.GetFormValuesForElementName(
114 element_name, L"", &values, 9999); 114 element_name, L"", &values, 9999);
115 EXPECT_THAT(values, matcher); 115 EXPECT_THAT(values, matcher);
116 } 116 }
117 } 117 }
118 118
119 // Launch |ie_mock| and navigate it to |url|. 119 // Launch |ie_mock| and navigate it to |url|.
120 ACTION_P2(LaunchThisIEAndNavigate, ie_mock, url) { 120 ACTION_P2(LaunchThisIEAndNavigate, ie_mock, url) {
121 EXPECT_HRESULT_SUCCEEDED(ie_mock->event_sink()->LaunchIEAndNavigate(url, 121 EXPECT_HRESULT_SUCCEEDED(ie_mock->event_sink()->LaunchIEAndNavigate(url,
122 ie_mock)); 122 ie_mock));
(...skipping 203 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_frame/test/chrome_frame_test_utils.cc ('k') | chrome_frame/test/http_negotiate_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698