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

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

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/prefs/browser_prefs.h" 10 #include "chrome/browser/prefs/browser_prefs.h"
11 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" 11 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
12 #include "chrome/common/chrome_notification_types.h" 12 #include "chrome/common/chrome_notification_types.h"
13 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
14 #include "chrome/test/base/testing_browser_process.h" 14 #include "chrome/test/base/testing_browser_process.h"
15 #include "chrome/test/base/testing_pref_service.h" 15 #include "chrome/test/base/testing_pref_service.h"
16 #include "content/public/browser/notification_service.h" 16 #include "content/public/browser/notification_service.h"
17 #include "content/public/common/url_fetcher.h" 17 #include "content/public/common/url_fetcher.h"
18 #include "content/test/test_browser_thread.h" 18 #include "content/test/test_browser_thread.h"
19 #include "content/test/test_url_fetcher_factory.h" 19 #include "content/test/test_url_fetcher_factory.h"
20 #include "net/url_request/url_request.h" 20 #include "net/url_request/url_request.h"
21 #include "net/url_request/url_request_context_getter.h" 21 #include "net/url_request/url_request_context_getter.h"
22 #include "net/url_request/url_request_test_util.h" 22 #include "net/url_request/url_request_test_util.h"
23 #include "testing/gtest/include/gtest/gtest.h" 23 #include "testing/gtest/include/gtest/gtest.h"
24 24
25 using content::BrowserThread;
26
25 // TestNotificationObserver --------------------------------------------------- 27 // TestNotificationObserver ---------------------------------------------------
26 28
27 namespace { 29 namespace {
28 30
29 class TestNotificationObserver : public content::NotificationObserver { 31 class TestNotificationObserver : public content::NotificationObserver {
30 public: 32 public:
31 TestNotificationObserver(); 33 TestNotificationObserver();
32 virtual ~TestNotificationObserver(); 34 virtual ~TestNotificationObserver();
33 35
34 virtual void Observe(int type, 36 virtual void Observe(int type,
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 NavEntryCommitted(); 447 NavEntryCommitted();
446 EXPECT_TRUE(InfoBarIsShown()); 448 EXPECT_TRUE(InfoBarIsShown());
447 449
448 AcceptGoogleURL(); 450 AcceptGoogleURL();
449 InfoBarClosed(); 451 InfoBarClosed();
450 EXPECT_FALSE(InfoBarIsShown()); 452 EXPECT_FALSE(InfoBarIsShown());
451 EXPECT_EQ(GURL("http://www.google.co.jp/"), GoogleURLTracker::GoogleURL()); 453 EXPECT_EQ(GURL("http://www.google.co.jp/"), GoogleURLTracker::GoogleURL());
452 EXPECT_EQ(GURL("http://www.google.co.jp/"), GetLastPromptedGoogleURL()); 454 EXPECT_EQ(GURL("http://www.google.co.jp/"), GetLastPromptedGoogleURL());
453 EXPECT_TRUE(observer_->notified()); 455 EXPECT_TRUE(observer_->notified());
454 } 456 }
OLDNEW
« no previous file with comments | « chrome/browser/google/google_update.cc ('k') | chrome/browser/history/expire_history_backend_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698