| OLD | NEW |
| 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/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 #include "content/public/browser/notification_registrar.h" | 40 #include "content/public/browser/notification_registrar.h" |
| 41 #include "content/public/browser/notification_service.h" | 41 #include "content/public/browser/notification_service.h" |
| 42 #include "content/public/browser/render_view_host.h" | 42 #include "content/public/browser/render_view_host.h" |
| 43 #include "content/public/browser/web_contents.h" | 43 #include "content/public/browser/web_contents.h" |
| 44 #include "content/public/test/browser_test_utils.h" | 44 #include "content/public/test/browser_test_utils.h" |
| 45 #include "content/public/test/test_renderer_host.h" | 45 #include "content/public/test/test_renderer_host.h" |
| 46 #include "net/url_request/test_url_fetcher_factory.h" | 46 #include "net/url_request/test_url_fetcher_factory.h" |
| 47 #include "testing/gtest/include/gtest/gtest.h" | 47 #include "testing/gtest/include/gtest/gtest.h" |
| 48 #include "ui/base/keycodes/keyboard_codes.h" | 48 #include "ui/base/keycodes/keyboard_codes.h" |
| 49 | 49 |
| 50 using base::WideToUTF16; |
| 50 using content::RenderViewHost; | 51 using content::RenderViewHost; |
| 51 using content::RenderViewHostTester; | 52 using content::RenderViewHostTester; |
| 52 using content::WebContents; | 53 using content::WebContents; |
| 53 | 54 |
| 54 static const char* kDataURIPrefix = "data:text/html;charset=utf-8,"; | 55 static const char* kDataURIPrefix = "data:text/html;charset=utf-8,"; |
| 55 static const char* kTestFormString = | 56 static const char* kTestFormString = |
| 56 "<form action=\"http://www.example.com/\" method=\"POST\">" | 57 "<form action=\"http://www.example.com/\" method=\"POST\">" |
| 57 "<label for=\"firstname\">First name:</label>" | 58 "<label for=\"firstname\">First name:</label>" |
| 58 " <input type=\"text\" id=\"firstname\"" | 59 " <input type=\"text\" id=\"firstname\"" |
| 59 " onFocus=\"domAutomationController.send(true)\"><br>" | 60 " onFocus=\"domAutomationController.send(true)\"><br>" |
| (...skipping 1612 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1672 // TODO(isherman): this looks redundant, consider removing. | 1673 // TODO(isherman): this looks redundant, consider removing. |
| 1673 // DISABLED: http://crbug.com/150084 | 1674 // DISABLED: http://crbug.com/150084 |
| 1674 IN_PROC_BROWSER_TEST_F(AutofillTest, | 1675 IN_PROC_BROWSER_TEST_F(AutofillTest, |
| 1675 DISABLED_MergeAggregatedDuplicatedProfiles) { | 1676 DISABLED_MergeAggregatedDuplicatedProfiles) { |
| 1676 int num_of_profiles = | 1677 int num_of_profiles = |
| 1677 AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt"); | 1678 AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt"); |
| 1678 | 1679 |
| 1679 ASSERT_GT(num_of_profiles, | 1680 ASSERT_GT(num_of_profiles, |
| 1680 static_cast<int>(personal_data_manager()->GetProfiles().size())); | 1681 static_cast<int>(personal_data_manager()->GetProfiles().size())); |
| 1681 } | 1682 } |
| OLD | NEW |