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

Side by Side Diff: chrome/browser/google/google_url_tracker_unittest.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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
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 "chrome/browser/google/google_url_tracker.h" 5 #include "chrome/browser/google/google_url_tracker.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 9
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "base/prefs/pref_service.h"
11 #include "chrome/browser/api/infobars/infobar_delegate.h" 12 #include "chrome/browser/api/infobars/infobar_delegate.h"
12 #include "chrome/browser/google/google_url_tracker_factory.h" 13 #include "chrome/browser/google/google_url_tracker_factory.h"
13 #include "chrome/browser/google/google_url_tracker_infobar_delegate.h" 14 #include "chrome/browser/google/google_url_tracker_infobar_delegate.h"
14 #include "chrome/browser/infobars/infobar.h" 15 #include "chrome/browser/infobars/infobar.h"
15 #include "chrome/browser/prefs/pref_service.h"
16 #include "chrome/common/chrome_notification_types.h" 16 #include "chrome/common/chrome_notification_types.h"
17 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
18 #include "chrome/test/base/testing_profile.h" 18 #include "chrome/test/base/testing_profile.h"
19 #include "content/public/browser/notification_service.h" 19 #include "content/public/browser/notification_service.h"
20 #include "content/public/test/test_browser_thread.h" 20 #include "content/public/test/test_browser_thread.h"
21 #include "net/url_request/test_url_fetcher_factory.h" 21 #include "net/url_request/test_url_fetcher_factory.h"
22 #include "net/url_request/url_fetcher.h" 22 #include "net/url_request/url_fetcher.h"
23 #include "testing/gtest/include/gtest/gtest.h" 23 #include "testing/gtest/include/gtest/gtest.h"
24 24
25 class GoogleURLTrackerTest; 25 class GoogleURLTrackerTest;
(...skipping 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after
1050 CommitSearch(2, GURL("http://www.google.co.uk/search?q=test2")); 1050 CommitSearch(2, GURL("http://www.google.co.uk/search?q=test2"));
1051 EXPECT_FALSE(GetInfoBar(1) == NULL); 1051 EXPECT_FALSE(GetInfoBar(1) == NULL);
1052 GoogleURLTrackerInfoBarDelegate* infobar2 = GetInfoBar(2); 1052 GoogleURLTrackerInfoBarDelegate* infobar2 = GetInfoBar(2);
1053 ASSERT_FALSE(infobar2 == NULL); 1053 ASSERT_FALSE(infobar2 == NULL);
1054 SetNavigationPending(1, true); 1054 SetNavigationPending(1, true);
1055 ASSERT_NO_FATAL_FAILURE(ExpectListeningForCommit(1, true)); 1055 ASSERT_NO_FATAL_FAILURE(ExpectListeningForCommit(1, true));
1056 infobar2->Close(false); 1056 infobar2->Close(false);
1057 SetNavigationPending(1, false); 1057 SetNavigationPending(1, false);
1058 ASSERT_NO_FATAL_FAILURE(ExpectListeningForCommit(1, false)); 1058 ASSERT_NO_FATAL_FAILURE(ExpectListeningForCommit(1, false));
1059 } 1059 }
OLDNEW
« no previous file with comments | « chrome/browser/google/google_url_tracker_factory.cc ('k') | chrome/browser/google/google_util_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698