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

Side by Side Diff: chrome/browser/importer/ie_importer_browsertest_win.cc

Issue 1109043003: Apply automated fixits for Chrome clang plugin to chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « chrome/browser/hang_monitor/hung_window_detector.h ('k') | chrome/browser/jumplist_win.h » ('j') | 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) 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 // The order of these includes is important. 5 // The order of these includes is important.
6 #include <windows.h> 6 #include <windows.h>
7 #include <unknwn.h> 7 #include <unknwn.h>
8 #include <intshcut.h> 8 #include <intshcut.h>
9 #include <propvarutil.h> 9 #include <propvarutil.h>
10 #include <shlguid.h> 10 #include <shlguid.h>
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 expected_favicon_url_found = true; 340 expected_favicon_url_found = true;
341 break; 341 break;
342 } 342 }
343 } 343 }
344 EXPECT_TRUE(expected_favicon_url_found); 344 EXPECT_TRUE(expected_favicon_url_found);
345 } 345 }
346 346
347 favicon_count_ += usage.size(); 347 favicon_count_ += usage.size();
348 } 348 }
349 349
350 virtual void AddIE7PasswordInfo(const IE7PasswordInfo& info) { 350 void AddIE7PasswordInfo(const IE7PasswordInfo& info) override {
351 // This function also gets called for the IEImporter test. Ignore. 351 // This function also gets called for the IEImporter test. Ignore.
352 if (ie_version_ == IE7) { 352 if (ie_version_ == IE7) {
353 EXPECT_EQ(L"Test1", info.url_hash); 353 EXPECT_EQ(L"Test1", info.url_hash);
354 EXPECT_EQ(1, info.encrypted_data[0]); 354 EXPECT_EQ(1, info.encrypted_data[0]);
355 EXPECT_EQ(4, info.encrypted_data.size()); 355 EXPECT_EQ(4, info.encrypted_data.size());
356 ++ie7_password_count_; 356 ++ie7_password_count_;
357 } 357 }
358 } 358 }
359 359
360 virtual void AddHomepage(const GURL& homepage) { 360 void AddHomepage(const GURL& homepage) override {
361 EXPECT_EQ(homepage.spec(), "http://www.test.com/"); 361 EXPECT_EQ(homepage.spec(), "http://www.test.com/");
362 ++homepage_count_; 362 ++homepage_count_;
363 } 363 }
364 364
365 private: 365 private:
366 ~TestObserver() {} 366 ~TestObserver() override {}
367 367
368 size_t bookmark_count_; 368 size_t bookmark_count_;
369 size_t history_count_; 369 size_t history_count_;
370 size_t password_count_; 370 size_t password_count_;
371 size_t favicon_count_; 371 size_t favicon_count_;
372 size_t homepage_count_; 372 size_t homepage_count_;
373 size_t ie7_password_count_; 373 size_t ie7_password_count_;
374 uint16 importer_items_; 374 uint16 importer_items_;
375 TestIEVersion ie_version_; 375 TestIEVersion ie_version_;
376 }; 376 };
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 source_profile.source_path = temp_dir_.path(); 646 source_profile.source_path = temp_dir_.path();
647 647
648 host->StartImportSettings( 648 host->StartImportSettings(
649 source_profile, 649 source_profile,
650 browser()->profile(), 650 browser()->profile(),
651 importer::HOME_PAGE, 651 importer::HOME_PAGE,
652 observer); 652 observer);
653 base::MessageLoop::current()->Run(); 653 base::MessageLoop::current()->Run();
654 } 654 }
655 655
OLDNEW
« no previous file with comments | « chrome/browser/hang_monitor/hung_window_detector.h ('k') | chrome/browser/jumplist_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698