Merge Chromium at r63472 : Fix conflicts.

SharedMemory added to stats_table.cc, duplicating Android change.
http://src.chromium.org/viewvc/chrome?view=rev&revision=62510

chrome/browser/guid.h added to chrome/browser/autofill:
http://src.chromium.org/viewvc/chrome?view=rev&revision=63173

chrome_thread.h renamed to browser_thread.h:
http://src.chromium.org/viewvc/chrome?view=rev&revision=62286

DnsRRResolverWorker substantially overhauled:
http://src.chromium.org/viewvc/chrome?view=rev&revision=61071

X509 certificates added for OpenSSL (replacing old Android hacks):
http://src.chromium.org/viewvc/chrome?view=rev&revision=61955

OpenSSL now available in Chrome (previously enabled for Android only):
http://src.chromium.org/viewvc/chrome?view=rev&revision=60936

Change-Id: I42e4fefcdabd996cb3c173dc412318b8c5ee20e2

1 files changed, 5 insertions, 35 deletions

diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.cc b/chrome/browser/net/sqlite_persistent_cookie_store.cc
index 2af79e2..be5e418 100644
--- a/chrome/browser/net/sqlite_persistent_cookie_store.cc
+++ b/chrome/browser/net/sqlite_persistent_cookie_store.cc
@@ -16,12 +16,8 @@
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/thread.h"
-<<<<<<< HEAD
 #ifndef ANDROID
-#include "chrome/browser/chrome_thread.h"
-=======
 #include "chrome/browser/browser_thread.h"
->>>>>>> chromium.org at r63472
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 #endif
 
@@ -146,13 +142,9 @@ void SQLitePersistentCookieStore::Backend::BatchOperation(
   static const int kCommitIntervalMs = 30 * 1000;
   // Commit right away if we have more than 512 outstanding operations.
   static const size_t kCommitAfterBatchSize = 512;
-<<<<<<< HEAD
 #ifndef ANDROID
-  DCHECK(!ChromeThread::CurrentlyOn(ChromeThread::DB));
-#endif
-=======
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::DB));
->>>>>>> chromium.org at r63472
+#endif
 
   // We do a full copy of the cookie here, and hopefully just here.
   scoped_ptr<PendingOperation> po(new PendingOperation(op, cc));
@@ -172,44 +164,30 @@ void SQLitePersistentCookieStore::Backend::BatchOperation(
 
   if (num_pending == 1) {
     // We've gotten our first entry for this batch, fire off the timer.
-<<<<<<< HEAD
 #ifdef ANDROID
     loop->PostDelayedTask(FROM_HERE, NewRunnableMethod(
         this, &Backend::Commit), kCommitIntervalMs);
 #else
-    ChromeThread::PostDelayedTask(
-        ChromeThread::DB, FROM_HERE,
-=======
     BrowserThread::PostDelayedTask(
         BrowserThread::DB, FROM_HERE,
->>>>>>> chromium.org at r63472
         NewRunnableMethod(this, &Backend::Commit), kCommitIntervalMs);
 #endif
   } else if (num_pending == kCommitAfterBatchSize) {
     // We've reached a big enough batch, fire off a commit now.
-<<<<<<< HEAD
 #ifdef ANDROID
     loop->PostTask(FROM_HERE, NewRunnableMethod(this, &Backend::Commit));
 #else
-    ChromeThread::PostTask(
-        ChromeThread::DB, FROM_HERE, NewRunnableMethod(this, &Backend::Commit));
-#endif
-=======
     BrowserThread::PostTask(
         BrowserThread::DB, FROM_HERE,
         NewRunnableMethod(this, &Backend::Commit));
->>>>>>> chromium.org at r63472
+#endif
   }
 }
 
 void SQLitePersistentCookieStore::Backend::Commit() {
-<<<<<<< HEAD
 #ifndef ANDROID
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::DB));
-#endif
-=======
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
->>>>>>> chromium.org at r63472
+#endif
   PendingOperationsList ops;
   {
     AutoLock locked(pending_lock_);
@@ -300,9 +278,8 @@ void SQLitePersistentCookieStore::Backend::Commit() {
 // pending commit timer that will be holding a reference on us, but if/when
 // this fires we will already have been cleaned up and it will be ignored.
 void SQLitePersistentCookieStore::Backend::Close() {
-<<<<<<< HEAD
 #ifndef ANDROID
-  DCHECK(!ChromeThread::CurrentlyOn(ChromeThread::DB));
+  DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::DB));
 #endif
 
 #ifdef ANDROID
@@ -313,9 +290,6 @@ void SQLitePersistentCookieStore::Backend::Close() {
   loop->PostTask(FROM_HERE,
       NewRunnableMethod(this, &Backend::InternalBackgroundClose));
 #else
-=======
-  DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::DB));
->>>>>>> chromium.org at r63472
   // Must close the backend on the background thread.
   BrowserThread::PostTask(
       BrowserThread::DB, FROM_HERE,
@@ -324,13 +298,9 @@ void SQLitePersistentCookieStore::Backend::Close() {
 }
 
 void SQLitePersistentCookieStore::Backend::InternalBackgroundClose() {
-<<<<<<< HEAD
 #ifndef ANDROID
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::DB));
-#endif
-=======
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
->>>>>>> chromium.org at r63472
+#endif
   // Commit any pending operations
   Commit();